cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge module_vars into inject during template instead of updating

Browse source 
This way we won't overwrite values that are stored in the inject
with module_vars that should be lower precedence.

Fixes #7510
This commit is contained in:
James Cammarata 2014-05-23 13:36:45 -05:00
parent 4aab832ac4
commit d77a6965b3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/runner/__init__.py
View file

@ -580,7 +580,7 @@ class Runner(object):
# we update the inject variables with the data we're about to template
# since some of the variables we'll be replacing may be contained there too
module_vars_inject = utils.combine_vars(combined_cache.get(host, {}), host_variables)
module_vars_inject.update(self.module_vars)
module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject)
module_vars = template.template(self.basedir, self.module_vars, module_vars_inject)
inject = {}