ae1540a455
- Bugfix: clean up `change` attribute from interface dict (upstream) Issue: https://github.com/saltstack/salt/issues/41461 PR: 1. https://github.com/saltstack/salt/pull/41487 2. https://github.com/saltstack/salt/pull/41533 Added: * clean-up-change-attribute-from-interface-dict.patch - Bugfix: orchestrate and batches returns false failed information https://github.com/saltstack/salt/issues/40635 - speed-up cherrypy by removing sleep call - wrong os_family grains on SUSE - fix unittests (bsc#1038855) - fix setting the language on SUSE systems (bsc#1038855) - Bugfix: unable to use hostname for minion ID as '127' (upstream) - Bugfix: remove sleep call in CheppryPy API handler (upstream) - Fix core grains constants for timezone (bsc#1032931) - Added: * bugfix-unable-to-use-127-as-hostname.patch * fix-grain-for-os_family-on-suse-series.patch * fix-os_family-case-in-unittest.patch * fix-setting-language-on-suse-systems.patch * fixed-issue-with-parsing-of-master-minion-returns-wh.patch * rest_cherrypy-remove-sleep-call.patch * use-correct-grain-constants-for-timezone.patch - Update to 2016.11.4 See https://docs.saltstack.com/en/develop/topics/releases/2016.11.4.html for full changelog - Changed: * add-options-for-dockerng.patch * fix-regression-in-file.get_managed-add-unit-tests.patch OBS-URL: https://build.opensuse.org/request/show/514025 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=89
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 36ab0b6a6f8830404e4cd1a9db1918d6703ed270 Mon Sep 17 00:00:00 2001
|
|
From: Graham Hayes <graham@hayes.ie>
|
|
Date: Mon, 22 May 2017 09:22:36 -0400
|
|
Subject: [PATCH] Fixed issue with parsing of master minion returns when
|
|
batching is enabled. (#30)
|
|
|
|
---
|
|
salt/states/saltmod.py | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/salt/states/saltmod.py b/salt/states/saltmod.py
|
|
index a9d1f6be93..35cd01fb4e 100644
|
|
--- a/salt/states/saltmod.py
|
|
+++ b/salt/states/saltmod.py
|
|
@@ -300,7 +300,7 @@ def state(
|
|
except KeyError:
|
|
m_state = False
|
|
if m_state:
|
|
- m_state = salt.utils.check_state_result(m_ret)
|
|
+ m_state = salt.utils.check_state_result(m_ret, recurse=True)
|
|
|
|
if not m_state:
|
|
if minion not in fail_minions:
|
|
@@ -309,9 +309,10 @@ def state(
|
|
continue
|
|
try:
|
|
for state_item in six.itervalues(m_ret):
|
|
- if 'changes' in state_item and state_item['changes']:
|
|
- changes[minion] = m_ret
|
|
- break
|
|
+ if isinstance(state_item, dict):
|
|
+ if 'changes' in state_item and state_item['changes']:
|
|
+ changes[minion] = m_ret
|
|
+ break
|
|
else:
|
|
no_change.add(minion)
|
|
except AttributeError:
|
|
--
|
|
2.13.0
|
|
|
|
|