archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove properties from vars in include_role (#38968)

Browse Source 
* remove properties from vars in include_role
* also from_ args
pull/20601/merge
Brian Coca 7 years ago committed by GitHub
parent bd8206b556
commit b9f7f582d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

@ -149,7 +149,7 @@ class IncludedFile:
inc_file = IncludedFile(include_file, include_variables, original_task) inc_file = IncludedFile(include_file, include_variables, original_task)
else: else:
# template the included role's name here # 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: if role_name is not None:
role_name = templar.template(role_name) role_name = templar.template(role_name)
@ -158,7 +158,7 @@ class IncludedFile:
for from_arg in new_task.FROM_ARGS: for from_arg in new_task.FROM_ARGS:
if from_arg in include_variables: if from_arg in include_variables:
from_key = from_arg.replace('_from', '') 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_name, include_variables, new_task, is_role=True) inc_file = IncludedFile(role_name, include_variables, new_task, is_role=True)

Write Preview
Loading…
Cancel
Save