diff options
| author | Jordan Borean <jborean93@gmail.com> | 2019-02-26 16:22:32 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 16:22:32 +1000 |
| commit | d55ddec9234755cb5fc026364b9e8d2b55130ce8 (patch) | |
| tree | 004f5e381213b1913d8879d265498a5d2b18aad2 /lib/ansible/executor | |
| parent | 344a81daece9277e9b0bf6269b4d4d83c0e33328 (diff) | |
| download | ansible-d55ddec9234755cb5fc026364b9e8d2b55130ce8.tar.gz | |
Revert Clear failed state in always only if we did rescue (#52968)
* Revert "Clear failed state in always only if we did rescue (#52829)"
This reverts commit f135960fc2e7572ce4e241b71cde64701a2d768c.
* Add tests for failed scenario
* Set failed task with EXPECTED FAILURE
Diffstat (limited to 'lib/ansible/executor')
| -rw-r--r-- | lib/ansible/executor/play_iterator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 63e4811789..ab40ce6723 100644 --- a/lib/ansible/executor/play_iterator.py +++ b/lib/ansible/executor/play_iterator.py @@ -484,7 +484,7 @@ class PlayIterator: elif state.fail_state != self.FAILED_NONE: if state.run_state == self.ITERATING_RESCUE and state.fail_state & self.FAILED_RESCUE == 0: return False - elif state.run_state == self.ITERATING_ALWAYS and state.fail_state & self.FAILED_ALWAYS == 0 and state.did_rescue: + elif state.run_state == self.ITERATING_ALWAYS and state.fail_state & self.FAILED_ALWAYS == 0: return False else: return not state.did_rescue |