Merge pull request #32143 from DSRCompany/issues/30183_failover_fix

Set auth retry count to 0 if multimaster mode is failover.
This commit is contained in:
Nicole Thomas 2016-03-25 09:23:09 -06:00
commit cc224b877a

View file

@ -411,6 +411,7 @@ class MinionBase(object):
' {0}'.format(opts['master']))
if opts['master_shuffle']:
shuffle(opts['master'])
opts['auth_tries'] = 0
# if opts['master'] is a str and we have never created opts['master_list']
elif isinstance(opts['master'], str) and ('master_list' not in opts):
# We have a string, but a list was what was intended. Convert.