Correctly initialize combined_cache for hosts if setup is skipped

Fixes #7364
2014-05-12 13:48:11 -05:00 · 2014-05-12 13:48:11 -05:00 · d725636469
parent ba9ecb6ae6
commit d725636469
1 changed files with 1 additions and 1 deletions
--- a/lib/ansible/runner/init.py
+++ b/lib/ansible/runner/init.py
@ -573,7 +573,7 @@ class Runner(object):

        # merge the VARS and SETUP caches for this host
        combined_cache = self.setup_cache.copy()
-        combined_cache.get(host, {}).update(self.vars_cache.get(host, {}))
+        combined_cache.setdefault(host, {}).update(self.vars_cache.get(host, {}))
        hostvars = HostVars(combined_cache, self.inventory, vault_password=self.vault_pass)

        # use combined_cache and host_variables to template the module_vars