From 9d9a451b3459fad615a87982dce7d2e68cecf29e Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 11 May 2016 19:10:30 -0400 Subject: [PATCH] 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 --- lib/ansible/executor/play_iterator.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ansible/executor/play_iterator.py b/lib/ansible/executor/play_iterator.py index 9ecda9395cd..7fa396307b3 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