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

Merge pull request #14904 from cachedout/fix_14099

Browse Source 
Continue if master in multi-master is down
This commit is contained in:
Thomas S Hatch 2014-08-12 11:46:01 -06:00
commit a6f21e140a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/minion.py
View File

@ -467,7 +467,7 @@ class MultiMinion(MinionBase):
try:
minions.append(Minion(s_opts, 5, False))
except SaltClientError as exc:
log.error('Error while bring up minion for multi-master. Is master responding?')
log.error('Error while bringing up minion for multi-master. Is master at {0} responding?'.format(master))
raise
return minions
@ -1349,7 +1349,7 @@ class Minion(MinionBase):
if creds == 'full':
return creds
elif creds != 'retry':
log.info('Authentication with master successful!')
log.info('Authentication with master at {0} successful!'.format(self.opts['master_ip']))
break
log.info('Waiting for minion key to be accepted by the master.')
if acceptance_wait_time: