mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Set auth retry count to 0 if multimaster mode is failover.
Backport of PR #31382 into 2015.8.
This commit is contained in:
parent
b84908d51f
commit
93d34a2573
1 changed files with 1 additions and 0 deletions
|
@ -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.
|
||||
|
|
Loading…
Add table
Reference in a new issue