cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #15745 playbook include: Conditional scoping

Browse source 
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
This commit is contained in:
Carl 2016-05-10 17:00:07 -04:00 committed by James Cammarata
parent 90fb1fb3fa
commit 2a512affde
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/playbook/playbook_include.py
View file

@ -96,7 +96,7 @@ class PlaybookInclude(Base, Conditional, Taggable):
# plays. If so, we can take a shortcut here and simply prepend them to # plays. If so, we can take a shortcut here and simply prepend them to
# those attached to each block (if any) # those attached to each block (if any)
if forward_conditional: 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 task_block.when = self.when[:] + task_block.when
return pb return pb