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 #51006 from dwoz/backport_50855

Browse source 
Let minions try to connect to master indefinitly
This commit is contained in:
Thomas S Hatch 2018-12-28 14:10:39 -07:00 • committed by GitHub
commit b8615e1564
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/minion.py
View file

@ -974,9 +974,8 @@ class MinionManager(MinionBase):
'''
if not self.minions:
err = ('Minion unable to successfully connect to '
'a Salt Master. Exiting.')
'a Salt Master.')
log.error(err)
raise SaltSystemExit(code=42, msg=err)
def _spawn_minions(self, timeout=60):
'''