Fixing new caching related issue with host vars

The vars_cache was not being properly merged with the setup_cache
for all hosts, which was previously not noticed when registered
variables were stored in the setup_cache.

Fixes #8944
This commit is contained in:
James Cammarata
2014-09-09 15:35:08 -05:00
parent 0179c13e04
commit 10afaee108
5 changed files with 20 additions and 2 deletions

View File

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