Merge pull request #29603 from basepi/orchestrate.failures.29546

Fix orchestration failure-checking
This commit is contained in:
Colton Myers 2015-12-10 14:23:57 -07:00
commit 1e394f5ab1

View file

@ -248,13 +248,13 @@ def state(
m_ret = mdata['ret']
except KeyError:
m_state = False
if not m_state:
if m_state:
m_state = salt.utils.check_state_result(m_ret)
if not m_state:
if minion not in fail_minions:
fail.add(minion)
failures[minion] = m_ret and m_ret or 'Minion did not respond'
failures[minion] = m_ret or 'Minion did not respond'
continue
for state_item in six.itervalues(m_ret):
if state_item['changes']: