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

Merge pull request #40096 from skizunov/develop3

Browse source 
When building up the 'master_uri_list', do not try to connect
This commit is contained in:
Mike Place 2017-03-17 11:13:40 -06:00 • committed by GitHub
commit 31da90edd9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/minion.py
View file

@ -541,7 +541,7 @@ class MinionBase(object):
for master in opts['local_masters']:
opts['master'] = master
opts.update(prep_ip_port(opts))
opts['master_uri_list'].append(resolve_dns(opts)['master_uri'])
opts['master_uri_list'].append(resolve_dns(opts, connect=False)['master_uri'])
while True:
if attempts != 0: