ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Use more variable sources when templating the play ds

Browse source 
Fixes #9699
This commit is contained in:
James Cammarata 2014-12-03 09:27:27 -06:00
parent eeec4f73e7
commit f1386bb114
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/playbook/play.py
View file

@ -108,10 +108,16 @@ class Play(object):
self._update_vars_files_for_host(None) self._update_vars_files_for_host(None)
# template everything to be efficient, but do not pre-mature template # template everything to be efficient, but do not pre-mature template
# tasks/handlers as they may have inventory scope overrides # tasks/handlers as they may have inventory scope overrides. We also
# create a set of temporary variables for templating, so we don't
# trample on the existing vars structures
_tasks = ds.pop('tasks', []) _tasks = ds.pop('tasks', [])
_handlers = ds.pop('handlers', []) _handlers = ds.pop('handlers', [])
ds = template(basedir, ds, self.vars)
temp_vars = utils.merge_hash(self.vars, self.vars_file_vars)
temp_vars = utils.merge_hash(temp_vars, self.playbook.extra_vars)
ds = template(basedir, ds, temp_vars)
ds['tasks'] = _tasks ds['tasks'] = _tasks
ds['handlers'] = _handlers ds['handlers'] = _handlers