Fix order of merging variables for the combined cache

Fixes #7598
11 years ago · d9df607972
parent 74f20ebf79
commit d9df607972
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/runner/init.py
+++ b/lib/ansible/runner/init.py
@ -579,7 +579,7 @@ class Runner(object):
        # use combined_cache and host_variables to template the module_vars
        # 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 = utils.combine_vars(host_variables, combined_cache.get(host, {}))
        module_vars_inject = utils.combine_vars(self.module_vars, module_vars_inject)
        module_vars = template.template(self.basedir, self.module_vars, module_vars_inject)