diff --git a/MANIFEST.in b/MANIFEST.in index 90af84b..53b17a5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ recursive-include rq * recursive-include doc * +recursive-include config * include README.md -include config.yaml diff --git a/config.yaml b/config/example.yaml similarity index 97% rename from config.yaml rename to config/example.yaml index 20dd8e9..3fc7bce 100644 --- a/config.yaml +++ b/config/example.yaml @@ -19,6 +19,7 @@ soft_filter: online: True # no_id: [0] # skip Fuel # no_roles: ['fuel'] # another way to skip Fuel + # no_status': ['deploying'] timeout: 15 compress_timeout: 3600 logs: diff --git a/setup.py b/setup.py index 16dd8ff..042263f 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,8 @@ pname = project_name dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', pname) rqfiles = [(os.path.join(dtm, root), [os.path.join(root, f) for f in files]) for root, dirs, files in os.walk('rq')] -rqfiles.append((os.path.join(dtm, 'configs'), ['config.yaml'])) +rqfiles.append((os.path.join(dtm, 'config'), + [os.path.join('config', 'example.yaml')])) package_data = True if os.environ.get("READTHEDOCS", False): diff --git a/timmy/conf.py b/timmy/conf.py index 9154deb..0083c34 100644 --- a/timmy/conf.py +++ b/timmy/conf.py @@ -24,7 +24,7 @@ def load_conf(filename): """Configuration parameters""" conf = {} conf['hard_filter'] = {} - conf['soft_filter'] = {'no_status': ['deploying'], 'online': True} + conf['soft_filter'] = {} conf['ssh_opts'] = ['-oConnectTimeout=2', '-oStrictHostKeyChecking=no', '-oUserKnownHostsFile=/dev/null', '-oLogLevel=error', '-lroot', '-oBatchMode=yes'] diff --git a/timmy/env.py b/timmy/env.py index ad1537e..1d450e8 100644 --- a/timmy/env.py +++ b/timmy/env.py @@ -16,7 +16,7 @@ # under the License. project_name = 'timmy' -version = '1.18.0' +version = '1.18.1' if __name__ == '__main__': import sys