diff options
| author | James Cammarata <jimi@sngx.net> | 2016-05-26 15:46:59 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2016-05-26 15:48:07 -0400 |
| commit | 3e03004b6f3344ca2352819a0bfb3a733bdd4b09 (patch) | |
| tree | 9ba810aeaaec97d5123297164643f8249aa1e3c5 /lib/ansible/vars | |
| parent | b755bcd875510261e916f61853a9c2019b57f620 (diff) | |
| download | ansible-3e03004b6f3344ca2352819a0bfb3a733bdd4b09.tar.gz | |
Use get_dep_chain() instead of directly using a blocks _dep_chain
Child blocks (whether nested or via includes) don't get a copy of the
dependency chain, so the above method should be used to ensure the block
looks at its parents dep chain.
Fixes #15996
Diffstat (limited to 'lib/ansible/vars')
| -rw-r--r-- | lib/ansible/vars/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/vars/__init__.py b/lib/ansible/vars/__init__.py index 66b816df96..e1f569abd2 100644 --- a/lib/ansible/vars/__init__.py +++ b/lib/ansible/vars/__init__.py @@ -232,7 +232,7 @@ class VariableManager: # sure it sees its defaults above any other roles, as we previously # (v1) made sure each task had a copy of its roles default vars if task and task._role is not None: - all_vars = combine_vars(all_vars, task._role.get_default_vars(dep_chain=task._block._dep_chain)) + all_vars = combine_vars(all_vars, task._role.get_default_vars(dep_chain=task._block.get_dep_chain())) if host: # next, if a host is specified, we load any vars from group_vars @@ -325,7 +325,7 @@ class VariableManager: if task: if task._role: all_vars = combine_vars(all_vars, task._role.get_vars(include_params=False)) - all_vars = combine_vars(all_vars, task._role.get_role_params(task._block._dep_chain)) + all_vars = combine_vars(all_vars, task._role.get_role_params(task._block.get_dep_chain())) all_vars = combine_vars(all_vars, task.get_vars()) if host: |