diff options
| author | Carl <jobguru1337@hotmail.com> | 2016-05-10 17:00:07 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-05-12 15:02:46 -0400 |
| commit | 2a512affde12934f5ccb45a9c9db655e6b2c9e13 (patch) | |
| tree | d0a49aeffd03637839073cab9b0786cf920ddd4c | |
| parent | 90fb1fb3faee94abaf8293c4543cdebe8f1083d3 (diff) | |
| download | ansible-2a512affde12934f5ccb45a9c9db655e6b2c9e13.tar.gz | |
Fixes #15745 playbook include: Conditional scoping
Fixes #15745
Applies conditional forwarding to all tasks/roles within the included playbook.
The existing line only applies forwarded conditionals to the main Task block, and misses pre_, post_, and roles.
Typo ::
Made a selection mistake when I copied over the one line change
| -rw-r--r-- | lib/ansible/playbook/playbook_include.py | 2 |
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 |