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

When adding nested blocks, don't pass in any parent includes

Browse source 
We previously changed block behavior to prefer includes over parent
blocks, which broke inheritence in nested blocks.

Fixes #15926
This commit is contained in:
James Cammarata 2016-05-23 10:01:41 -04:00 committed by Toshio Kuratomi
parent a6bff1e49c
commit 09fa05373b
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/helpers.py
View file

@ -95,7 +95,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
play=play, play=play,
parent_block=block, parent_block=block,
role=role, role=role,
task_include=task_include, task_include=None,
use_handlers=use_handlers, use_handlers=use_handlers,
variable_manager=variable_manager, variable_manager=variable_manager,
loader=loader, loader=loader,