saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #35489 from rallytime/bp-35463

Browse source 
Back-port #35463 to 2016.3
This commit is contained in:
Mike Place 2016-08-18 16:16:03 +09:00 • committed by GitHub
commit f2eb3dc105
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/config/__init__.py
View file

@ -1045,7 +1045,7 @@ DEFAULT_MINION_OPTS = {
'minion_id_caching': True,
'keysize': 2048,
'transport': 'zeromq',
'auth_timeout': 60,
'auth_timeout': 5,
'auth_tries': 7,
'master_tries': _MASTER_TRIES,
'auth_safemode': False,

6
salt/minion.py
View file

@ -714,9 +714,6 @@ class MultiMinion(MinionBase):
defined in the master option and binds each minion object to a respective
master.
'''
# timeout for one of the minions to auth with a master
MINION_CONNECT_TIMEOUT = 5
def __init__(self, opts):
super(MultiMinion, self).__init__(opts)
self.auth_wait = self.opts['acceptance_wait_time']
@ -750,7 +747,6 @@ class MultiMinion(MinionBase):
s_opts = copy.deepcopy(self.opts)
s_opts['master'] = master
s_opts['multimaster'] = True
s_opts['auth_timeout'] = self.MINION_CONNECT_TIMEOUT
if self.opts.get('ipc_mode') == 'tcp':
# If one is a list, we can assume both are, because of check above
if isinstance(self.opts['tcp_pub_port'], list):
@ -772,7 +768,7 @@ class MultiMinion(MinionBase):
while True:
try:
minion = Minion(opts,
self.MINION_CONNECT_TIMEOUT,
opts['auth_timeout'],
False,
io_loop=self.io_loop,
loaded_base_name='salt.loader.{0}'.format(opts['master']),