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

Fix some bugs related to facts/nonpersistent-facts cache split

Browse source 
Fixes #12313
This commit is contained in:
James Cammarata 2015-09-10 17:36:06 -04:00
parent 1e2dc212bd
commit 292e2da4e1
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/strategies/__init__.py
View file

@ -267,7 +267,7 @@ class StrategyBase:
return v
var_value = _wrap_var(var_value)
self._variable_manager.set_host_facts(host, {var_name: var_value})
self._variable_manager.set_nonpersistent_facts(host, {var_name: var_value})
elif result[0] in ('set_host_var', 'set_host_facts'):
host = result[1]
@ -293,7 +293,10 @@ class StrategyBase:
self._variable_manager.set_host_variable(target_host, var_name, var_value)
elif result[0] == 'set_host_facts':
facts = result[4]
self._variable_manager.set_host_facts(target_host, facts)
if task.action == 'set_fact':
self._variable_manager.set_nonpersistent_facts(target_host, facts)
else:
self._variable_manager.set_host_facts(target_host, facts)
else:
raise AnsibleError("unknown result message received: %s" % result[0])

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

@ -390,6 +390,21 @@ class VariableManager:
assert isinstance(facts, dict)
if host.name not in self._fact_cache:
self._fact_cache[host.name] = facts
else:
try:
self._fact_cache[host.name].update(facts)
except KeyError:
self._fact_cache[host.name] = facts
def set_nonpersistent_facts(self, host, facts):
'''
Sets or updates the given facts for a host in the fact cache.
'''
assert isinstance(facts, dict)
if host.name not in self._nonpersistent_fact_cache:
self._nonpersistent_fact_cache[host.name] = facts
else: