1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge conflict.

This commit is contained in:
Michael DeHaan 2014-03-16 13:36:52 -04:00
parent 3d44f7cd51
commit 2b2b174fd3

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