Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix orchestration failure-checking #29603

Merged
merged 2 commits into from
Dec 10, 2015
Merged

Fix orchestration failure-checking #29603

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501f91a
Fix error in failure checking for salt.state within orchestration
basepi Dec 10, 2015
2bdcada
Remove unnecessary and
basepi Dec 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions salt/states/saltmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']:
Expand Down