Commit e85a9abe by James Cammarata

Fix order of merging variables for the combined cache

Fixes #7598
parent b99ea272
...@@ -572,8 +572,8 @@ class Runner(object): ...@@ -572,8 +572,8 @@ 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.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 = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment