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 4

Fix more deltaproxy tests

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-05-18 00:10:57 -07:00 • committed by Gareth J. Greenaway
parent ca241b75d4
commit 486802f6dd
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/__init__.py
View file

@ -12,6 +12,7 @@ if sys.version_info < (3,):
)
sys.stderr.flush()
USE_VENDORED_TORNADO = False

5
salt/metaproxy/deltaproxy.py
View file

@ -356,10 +356,11 @@ def post_master_init(self, master):
except Exception as exc: # pylint: disable=broad-except
log.error("Errors loading sub proxies")
_failed = self.opts["proxy"].get("ids", [])
_failed = self.opts["proxy"].get("ids", [])[:]
for sub_proxy_data in results:
minion_id = sub_proxy_data["proxy_opts"].get("id")
_failed.remove(minion_id)
if minion_id in _failed:
_failed.remove(minion_id)
if sub_proxy_data["proxy_minion"]:
self.deltaproxy_opts[minion_id] = sub_proxy_data["proxy_opts"]

1
salt/minion.py
View file

@ -1162,6 +1162,7 @@ class MinionManager(MinionBase):
minion.opts["master"],
exc_info=True,
)
break
# Multi Master Tune In
def tune_in(self):