Set auth retry count to 0 if multimaster mode is failover.

Backport of PR #31382 into 2015.5.
2024-11-08 01:18:58 +00:00 · 2016-02-24 19:00:32 +03:00 · 2016-02-24 19:00:32 +03:00 · 3d09c3b7a3
commit 3d09c3b7a3
parent 26733ce988
1 changed files with 1 additions and 0 deletions
--- a/salt/minion.py
+++ b/salt/minion.py
@ -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