summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2017-05-17 09:41:48 -0500
committerJames Cammarata <jimi@sngx.net>2017-05-17 13:39:38 -0500
commit4714e742114b463e3c6386b57d6cff0008957a95 (patch)
tree38f91708d4b6a8bc194c38b4b03a72e161a947a2
parentd3c94e82a5cee89c2388ee13f89d5e01d24d475b (diff)
downloadansible-issue_24301_always_not_triggered.tar.gz
Also check the iterator for failed host status in linear strategyissue_24301_always_not_triggered
When only looking at the failed state of the TaskResult, certain failures cause the linear strategy to fail out sooner than it should and not execute the always portion of blocks. Fixes #24301
-rw-r--r--lib/ansible/plugins/strategy/linear.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/plugins/strategy/linear.py b/lib/ansible/plugins/strategy/linear.py
index b21cb68df4..f4f385e297 100644
--- a/lib/ansible/plugins/strategy/linear.py
+++ b/lib/ansible/plugins/strategy/linear.py
@@ -399,7 +399,7 @@ class StrategyModule(StrategyBase):
failed_hosts = []
unreachable_hosts = []
for res in results:
- if res.is_failed():
+ if res.is_failed() and iterator.is_failed(res._host):
failed_hosts.append(res._host.name)
elif res.is_unreachable():
unreachable_hosts.append(res._host.name)