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

Don't fail if can't connect to master

Browse source
This commit is contained in:
Dmitry Kuzmenko 2015-12-02 15:25:06 +03:00
parent 73c33e0b4a
commit 1c324f5467
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/daemons/flo/core.py
View file

@ -34,6 +34,7 @@ from salt.utils.event import tagify
from ioflo.aid.odicting import odict # pylint: disable=E0611,F0401
import ioflo.base.deeding
from ioflo.base.consoling import getConsole
from _socket import gaierror
console = getConsole()
# Import Third Party Libs
@ -381,12 +382,15 @@ class SaltRaetRoadStackJoiner(ioflo.base.deeding.Deed):
stack.puid = stack.Uid # reset puid so reuse same uid each time
for master in self.ushers.value:
mha = master['external']
stack.addRemote(RemoteEstate(stack=stack,
fuid=0, # vacuous join
sid=0, # always 0 for join
ha=mha,
kind=kinds.applKinds.master))
try:
mha = master['external']
stack.addRemote(RemoteEstate(stack=stack,
fuid=0, # vacuous join
sid=0, # always 0 for join
ha=mha,
kind=kinds.applKinds.master))
except gaierror as ex:
log.warning("Unable to connect to master {0}: {1}".format(mha, ex))
for remote in list(stack.remotes.values()):
if remote.kind == kinds.applKinds.master: