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.5.
This commit is contained in:
parent
26733ce988
commit
3d09c3b7a3
1 changed files with 1 additions and 0 deletions
|
@ -815,6 +815,7 @@ class Minion(MinionBase):
|
|||
opts['master_active_list'] = opts['master']
|
||||
if opts.get('master_shuffle'):
|
||||
shuffle(opts['master_list'])
|
||||
opts['auth_tries'] = 0
|
||||
elif isinstance(opts['master'], str):
|
||||
# We have a string, but a list was what was intended. Convert.
|
||||
# See issue 23611 for details
|
||||
|
|
Loading…
Add table
Reference in a new issue