valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Converge on transport instead of salt_transport

Browse Source
This commit is contained in:
Thomas S Hatch 2014-02-24 16:37:11 -07:00
parent cc8c4a8fe7
commit 7d1ae66f07
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/config.py
View File

@ -188,7 +188,7 @@ VALID_OPTS = {
'minion_id_caching': bool,
'sign_pub_messages': bool,
'keysize': int,
'salt_transport': str,
'transport': str,
'enumerate_proxy_minions': bool,
'gather_job_timeout': int,
'auth_timeout': int,
@ -295,7 +295,7 @@ DEFAULT_MINION_OPTS = {
'grains_refresh_every': 0,
'minion_id_caching': True,
'keysize': 4096,
'salt_transport': 'zeromq',
'transport': 'zeromq',
'auth_timeout': 3,
'random_master': False,
}
@ -413,7 +413,7 @@ DEFAULT_MASTER_OPTS = {
'jinja_trim_blocks': False,
'sign_pub_messages': False,
'keysize': 4096,
'salt_transport': 'zeromq',
'transport': 'zeromq',
'enumerate_proxy_minions': False,
'gather_job_timeout': 2,
'syndic_event_forward_timeout': 0.5,

8
salt/transport/__init__.py
View File

@ -13,10 +13,10 @@ class Channel(object):
# Default to ZeroMQ for now
ttype = 'zeromq'
if 'transport_type' in opts:
ttype = opts['transport_type']
elif 'transport_type' in opts.get('pillar', {}).get('master', {}):
ttype = opts['pillar']['master']['transport_type']
if 'transport' in opts:
ttype = opts['transport']
elif 'transport' in opts.get('pillar', {}).get('master', {}):
ttype = opts['pillar']['master']['transport']
if ttype == 'zeromq':
return ZeroMQChannel(opts, **kwargs)