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

Merge conflict.

Browse source
This commit is contained in:
Michael DeHaan 2014-03-16 13:36:52 -04:00
parent 0281dbf2f2
commit 790a38e25d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
system/setup
View file

@ -2305,8 +2305,8 @@ def ansible_facts(module):
def run_setup(module):
setup_options = {}
facts = ansible_facts(module)
setup_options = dict(module_setup=True)
facts = ansible_facts()
for (k, v) in facts.items():
setup_options["ansible_%s" % k.replace('-', '_')] = v