wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace - with _ in setup module key names to avoid variable access problems reported in #954

Browse source
This commit is contained in:
Timothy Appnel 2012-08-28 19:02:19 -04:00
parent 9f7ad62376
commit 8c32aefc80
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/setup
View file

@ -598,7 +598,7 @@ def run_setup(module):
facts = ansible_facts() facts = ansible_facts()
for (k, v) in facts.items(): for (k, v) in facts.items():
setup_options["ansible_%s" % k] = v setup_options["ansible_%s" % k.replace('-', '_')] = v
# if facter is installed, and we can use --json because # if facter is installed, and we can use --json because
# ruby-json is ALSO installed, include facter data in the JSON # ruby-json is ALSO installed, include facter data in the JSON
@ -614,7 +614,7 @@ def run_setup(module):
facter = False facter = False
if facter: if facter:
for (k,v) in facter_ds.items(): for (k,v) in facter_ds.items():
setup_options["facter_%s" % k] = v setup_options["facter_%s" % k.replace('-', '_')] = v
# ditto for ohai, but just top level string keys # ditto for ohai, but just top level string keys
# because it contains a lot of nested stuff we can't use for # because it contains a lot of nested stuff we can't use for
@ -632,7 +632,7 @@ def run_setup(module):
if ohai: if ohai:
for (k,v) in ohai_ds.items(): for (k,v) in ohai_ds.items():
if type(v) == str or type(v) == unicode: if type(v) == str or type(v) == unicode:
k2 = "ohai_%s" % k k2 = "ohai_%s" % k.replace('-', '_')
setup_options[k2] = v setup_options[k2] = v
setup_result = {} setup_result = {}