Commit 6777268f by Michael DeHaan

Fixup the code that allows facter/ohai/other data to bubble up and be used in…

Fixup the code that allows facter/ohai/other data to bubble up and be used in future action lines.  It's a niche
case compared to usage in templates but it should work and will be wanted later for conditional support.
parent c861e0de
...@@ -371,6 +371,15 @@ class Runner(object): ...@@ -371,6 +371,15 @@ class Runner(object):
except: except:
var_result = {} var_result = {}
# note: do not allow variables from playbook to be stomped on
# by variables coming up from facter/ohai/etc. They
# should be prefixed anyway
if not host in self.setup_cache:
self.setup_cache[host] = {}
for (k, v) in var_result.iteritems():
if not k in self.setup_cache[host]:
self.setup_cache[host][k] = v
return self._return_from_module(conn, host, result) return self._return_from_module(conn, host, result)
# ***************************************************** # *****************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment