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

Move comment.

Browse source
This commit is contained in:
C. R. Oldham 2015-06-23 10:57:36 -06:00
parent b9a756ff5f
commit e2314f0e49
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/minion.py
View file

@ -793,6 +793,10 @@ class Minion(MinionBase):
# if failover is set, the first time through, opts['master'] is a list.
elif opts['master_type'] == 'failover':
# if failed=True, the minion was previously connected
# we're probably called from the minions main-event-loop
# because a master connection loss was detected. remove
# the possibly failed master from the list of masters.
if failed:
log.info('Removing possibly failed master {0} from list of'
' masters'.format(opts['master']))
@ -811,10 +815,6 @@ class Minion(MinionBase):
opts['master'] = [opts['master']]
opts['master_list'] = opts['master']
opts['master_active_list'] = opts['master']
# if failed=True, the minion was previously connected
# we're probably called from the minions main-event-loop
# because a master connection loss was detected. remove
# the possibly failed master from the list of masters.
else:
msg = ('master_type set to \'failover\' but \'master\' '
'is not of type list but of type '