x/timmy
Code Issues Proposed changes

removed soft filtering by default

Browse Source
This commit is contained in:
Aleksandr Dobdin 2016-09-02 13:16:38 +00:00
parent 721cb4f97b
commit 9cfe4d20d2
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -1,4 +1,4 @@
recursive-include rq * recursive-include rq *
recursive-include doc * recursive-include doc *
recursive-include config *
include README.md include README.md
include config.yaml

1
config.yaml → config/example.yaml
View File

@ -19,6 +19,7 @@ soft_filter:
online: True online: True
# no_id: [0] # skip Fuel # no_id: [0] # skip Fuel
# no_roles: ['fuel'] # another way to skip Fuel # no_roles: ['fuel'] # another way to skip Fuel
# no_status': ['deploying']
timeout: 15 timeout: 15
compress_timeout: 3600 compress_timeout: 3600
logs: logs:

3
setup.py
View File

@ -24,7 +24,8 @@ pname = project_name
dtm = os.path.join(os.path.abspath(os.sep), 'usr', 'share', pname) 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]) rqfiles = [(os.path.join(dtm, root), [os.path.join(root, f) for f in files])
for root, dirs, files in os.walk('rq')] 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 package_data = True
if os.environ.get("READTHEDOCS", False): if os.environ.get("READTHEDOCS", False):

2
timmy/conf.py
View File

@ -24,7 +24,7 @@ def load_conf(filename):
"""Configuration parameters""" """Configuration parameters"""
conf = {} conf = {}
conf['hard_filter'] = {} conf['hard_filter'] = {}
conf['soft_filter'] = {'no_status': ['deploying'], 'online': True} conf['soft_filter'] = {}
conf['ssh_opts'] = ['-oConnectTimeout=2', '-oStrictHostKeyChecking=no', conf['ssh_opts'] = ['-oConnectTimeout=2', '-oStrictHostKeyChecking=no',
'-oUserKnownHostsFile=/dev/null', '-oLogLevel=error', '-oUserKnownHostsFile=/dev/null', '-oLogLevel=error',
'-lroot', '-oBatchMode=yes'] '-lroot', '-oBatchMode=yes']

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.18.0' version = '1.18.1'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys