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

Merge pull request #35463 from skizunov/develop2

Browse Source 
Make `auth_timeout` user configurable again
This commit is contained in:
Mike Place 2016-08-16 10:28:25 +09:00 committed by GitHub
commit 6bce9802c1
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

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

6
salt/minion.py
View File

@ -731,9 +731,6 @@ class MinionManager(MinionBase):
defined in the master option and binds each minion object to a respective defined in the master option and binds each minion object to a respective
master. master.
''' '''
# timeout for one of the minions to auth with a master
MINION_CONNECT_TIMEOUT = 5
def __init__(self, opts): def __init__(self, opts):
super(MinionManager, self).__init__(opts) super(MinionManager, self).__init__(opts)
self.auth_wait = self.opts['acceptance_wait_time'] self.auth_wait = self.opts['acceptance_wait_time']
@ -771,9 +768,8 @@ class MinionManager(MinionBase):
s_opts = copy.deepcopy(self.opts) s_opts = copy.deepcopy(self.opts)
s_opts['master'] = master s_opts['master'] = master
s_opts['multimaster'] = True s_opts['multimaster'] = True
s_opts['auth_timeout'] = self.MINION_CONNECT_TIMEOUT
minion = Minion(s_opts, minion = Minion(s_opts,
self.MINION_CONNECT_TIMEOUT, s_opts['auth_timeout'],
False, False,
io_loop=self.io_loop, io_loop=self.io_loop,
loaded_base_name='salt.loader.{0}'.format(s_opts['master']), loaded_base_name='salt.loader.{0}'.format(s_opts['master']),