summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-09-07 15:15:14 -0500
committerJames Cammarata <jimi@sngx.net>2016-09-07 15:16:11 -0500
commitd1a7e07ccc368113d90da677d66e48e5aff21e56 (patch)
tree9f408742ad4048ee0df55723e79e1de26842f0f6
parent715b800ef12cf4aeb5740a6a955a50df52bd34e3 (diff)
downloadansible-d1a7e07ccc368113d90da677d66e48e5aff21e56.tar.gz
Fixing another logic issue related to include_role changes
-rw-r--r--lib/ansible/executor/task_executor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index 13906224b4..80c9b279a5 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -406,7 +406,7 @@ class TaskExecutor:
return dict(changed=False, skipped=True, skip_reason='Conditional check failed', _ansible_no_log=self._play_context.no_log)
except AnsibleError:
# skip conditional exception in the case of includes as the vars needed might not be avaiable except in the included tasks or due to tags
- if self._task.action in ['include', 'include_role']:
+ if self._task.action not in ['include', 'include_role']:
raise
# if we ran into an error while setting up the PlayContext, raise it now