internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 22:33:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix order of merging variables for the combined cache

Browse Source 
Fixes #7598
This commit is contained in:
James Cammarata
2014-06-04 10:50:41 -05:00
parent 74f20ebf79
commit d9df607972
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

@@ -579,7 +579,7 @@ class Runner(object):
# use combined_cache and host_variables to template the module_vars # use combined_cache and host_variables to template the module_vars
# 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(host_variables, combined_cache.get(host, {}))
module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject) 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)