valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use SSDP discovery, when master hostname is default or not configured

Browse Source
This commit is contained in:
Bo Maryniuk 2017-11-15 14:32:36 +01:00
parent 84228a3546
commit c74876fb96
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/minion.py
View File

@ -105,6 +105,7 @@ import salt.utils.network
import salt.utils.platform
import salt.utils.process
import salt.utils.schedule
import salt.utils.ssdp
import salt.utils.user
import salt.utils.zeromq
import salt.defaults.exitcodes
@ -660,8 +661,9 @@ class MinionBase(object):
# single master sign in
else:
if opts['random_master']:
log.warning('random_master is True but there is only one master specified. Ignoring.')
self._discover_masters(opts)
if opts[u'random_master']:
log.warning(u'random_master is True but there is only one master specified. Ignoring.')
while True:
if attempts != 0:
# Give up a little time between connection attempts
@ -705,6 +707,19 @@ class MinionBase(object):
self.connected = False
raise exc
def _discover_masters(self, opts):
'''
Discover master(s) and decide where to connect, if SSDP is around.
:return:
'''
if opts['master'] == DEFAULT_MINION_OPTS['master']:
master_discovery_client = salt.utils.ssdp.SSDPDiscoveryClient()
try:
proto_data, ssdp_addr = master_discovery_client.discover()
except Exception:
proto_data = {'master': 'salt'}
opts['master'] = proto_data['master']
def _return_retry_timer(self):
'''
Based on the minion configuration, either return a randomized timer or