summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-05-12 15:02:17 -0400
committerJames Cammarata <jimi@sngx.net>2016-05-12 15:02:17 -0400
commitae09648068ffa00a0f39e6edad23ba6ddd30d7a0 (patch)
tree72d6adb9ac7cdc7615cf87bf018b04a37ae661d5
parentb4e78caf25ff135f05f35348e20d0b180e8a66e4 (diff)
parentfefd87c61a1cfa7ecc04394c56d45a2b8317d617 (diff)
downloadansible-ae09648068ffa00a0f39e6edad23ba6ddd30d7a0.tar.gz
Merge pull request #15812 from cThrice/patch-3
Fixes #15745 playbook include: Conditional scoping
-rw-r--r--lib/ansible/playbook/playbook_include.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py
index f481ba142c..9cac3317c2 100644
--- a/lib/ansible/playbook/playbook_include.py
+++ b/lib/ansible/playbook/playbook_include.py
@@ -96,7 +96,7 @@ class PlaybookInclude(Base, Conditional, Taggable):
# plays. If so, we can take a shortcut here and simply prepend them to
# those attached to each block (if any)
if forward_conditional:
- for task_block in entry.tasks:
+ for task_block in entry.pre_tasks + entry.roles + entry.tasks + entry.post_tasks:
task_block.when = self.when[:] + task_block.when
return pb