Use utils.merge_hash() instead of update for cache merging

Fixes #8968
pull/8969/head
James Cammarata 10 years ago
parent 239b6e79c3
commit dacb6b8561

@ -598,7 +598,7 @@ class Runner(object):
# merge the VARS and SETUP caches for this host # merge the VARS and SETUP caches for this host
combined_cache = self.setup_cache.copy() combined_cache = self.setup_cache.copy()
combined_cache.update(self.vars_cache) combined_cache = utils.merge_hash(combined_cache, self.vars_cache)
hostvars = HostVars(combined_cache, self.inventory, vault_password=self.vault_pass) hostvars = HostVars(combined_cache, self.inventory, vault_password=self.vault_pass)

Loading…
Cancel
Save