Correctly initialize combined_cache for hosts if setup is skipped

Fixes #7364
pull/7527/head
Chris Church 11 years ago committed by James Cammarata
parent 9d8eee633d
commit 29018cf2a7

@ -566,7 +566,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

Loading…
Cancel
Save