internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages 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
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 # 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 # 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 = 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) module_vars = template.template(self.basedir, self.module_vars, module_vars_inject)
inject = {} inject = {}