diff options
| author | James Cammarata <jimi@sngx.net> | 2016-05-11 19:10:30 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-05-12 17:12:07 -0400 |
| commit | 1c2f0ae8f7d790a395d6ba430f9a23adacad2252 (patch) | |
| tree | c7a0ce953566a1fac1a3d7c1ba3a21b22cb62d99 | |
| parent | 3a052654f31fd15cf583e8188a825dbc55563a3e (diff) | |
| download | ansible-1c2f0ae8f7d790a395d6ba430f9a23adacad2252.tar.gz | |
Simply being in an always block shouldn't mean a host did not fail
Previously the changed code was necessary, however it is now problematic
as we've started using the is_failed() method in other places in the code.
Additional changes at the strategy layer should make this safe to remove
now.
Fixes #15625
| -rw-r--r-- | lib/ansible/executor/play_iterator.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 6a40d2a4bf..0b46c3925e 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -475,8 +475,7 @@ class PlayIterator: if state is None: return False elif state.fail_state != self.FAILED_NONE: - if state.run_state == self.ITERATING_RESCUE and state.fail_state&self.FAILED_RESCUE == 0 or \ - state.run_state == self.ITERATING_ALWAYS and state.fail_state&self.FAILED_ALWAYS == 0: + if state.run_state == self.ITERATING_RESCUE and state.fail_state&self.FAILED_RESCUE == 0: return False else: return True |