cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing up fact_cache use in VariableManager

Browse source
This commit is contained in:
James Cammarata 2015-07-13 11:06:03 -04:00
parent 932d1e57f7
commit d977da5b41
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/plugins/cache/jsonfile.py vendored
View file

@ -73,7 +73,7 @@ class CacheModule(BaseCacheModule):
except ValueError:
# FIXME: this is in display now, but cache plugins don't have that
#utils.warning("error while trying to write to %s : %s" % (cachefile, str(e)))
return dict()
raise KeyError
finally:
f.close()

15
lib/ansible/vars/__init__.py
View file

@ -181,7 +181,10 @@ class VariableManager:
all_vars = self._combine_vars(all_vars, host.get_vars())
# next comes the facts cache and the vars cache, respectively
all_vars = self._combine_vars(all_vars, self._fact_cache.get(host.get_name(), dict()))
try:
all_vars = self._combine_vars(all_vars, self._fact_cache.get(host.name, dict()))
except KeyError:
pass
if play:
all_vars = self._combine_vars(all_vars, play.get_vars())
@ -345,11 +348,13 @@ class VariableManager:
assert isinstance(facts, dict)
host_name = host.get_name()
if host_name not in self._fact_cache:
self._fact_cache[host_name] = facts
if host.name not in self._fact_cache:
self._fact_cache[host.name] = facts
else:
self._fact_cache[host_name].update(facts)
try:
self._fact_cache[host.name].update(facts)
except KeyError:
self._fact_cache[host.name] = facts
def set_host_variable(self, host, varname, value):
'''