habsi/ansible
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove properties from vars in include_role (#38968)

Browse Source 
* remove properties from vars in include_role
* also from_ args

(cherry picked from commit b9f7f582d1)
This commit is contained in:
Brian Coca
2018-05-01 10:16:59 -04:00
parent 82abfa7ddf
commit 0cd5457ea2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/remove_key_from_vars.yml Normal file
View File

@ -0,0 +1,2 @@
- bugfixes:
- disambiguate keywords from variables in include_role https://github.com/ansible/ansible/pull/38968

4
lib/ansible/playbook/included_file.py
View File

@ -142,7 +142,7 @@ class IncludedFile:
inc_file = IncludedFile(include_file, include_variables, original_task)
else:
# template the included role's name here
role_name = include_variables.get('name', include_variables.get('role', None))
role_name = include_variables.pop('name', include_variables.pop('role', None))
if role_name is not None:
role_name = templar.template(role_name)
@ -151,7 +151,7 @@ class IncludedFile:
for from_arg in new_task.FROM_ARGS:
if from_arg in include_variables:
from_key = from_arg.replace('_from', '')
new_task._from_files[from_key] = templar.template(include_variables[from_arg])
new_task._from_files[from_key] = templar.template(include_variables.pop(from_arg))
inc_file = IncludedFile("role", include_variables, new_task, is_role=True)