diff options
| author | James Cammarata <jimi@sngx.net> | 2016-05-23 10:01:41 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-05-23 10:08:14 -0400 |
| commit | 3f78b37e2916d63c12ba3a723fcc71dba8dbdadc (patch) | |
| tree | c2902893d9de82aa282a7946c26c3355c217c206 | |
| parent | 745ae351355d20d95fdf6831181de2045a3a63f6 (diff) | |
| download | ansible-stable-2.1.1.tar.gz | |
When adding nested blocks, don't pass in any parent includesstable-2.1.1
We previously changed block behavior to prefer includes over parent
blocks, which broke inheritence in nested blocks.
Fixes #15926
| -rw-r--r-- | lib/ansible/playbook/helpers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/playbook/helpers.py b/lib/ansible/playbook/helpers.py index ee7d922801..05556f3aa3 100644 --- a/lib/ansible/playbook/helpers.py +++ b/lib/ansible/playbook/helpers.py @@ -95,7 +95,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h play=play, parent_block=block, role=role, - task_include=task_include, + task_include=None, use_handlers=use_handlers, variable_manager=variable_manager, loader=loader, |