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

Merge branch 'devel' of git://github.com/shirou/ansible into devel

Browse source
This commit is contained in:
Michael DeHaan 2013-10-14 11:50:25 -04:00
commit 6ff4806b90
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/system/setup
View file

@ -3,7 +3,7 @@
# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
#
#n This file is part of Ansible
# This file is part of Ansible
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -2140,9 +2140,7 @@ def run_setup(module):
for (k,v) in facter_ds.items():
setup_options["facter_%s" % k] = v
# ditto for ohai, but just top level string keys
# because it contains a lot of nested stuff we can't use for
# templating w/o making a nicer key for it (TODO)
# ditto for ohai
if ohai_path is not None:
rc, out, err = module.run_command(ohai_path)
@ -2153,7 +2151,6 @@ def run_setup(module):
ohai = False
if ohai:
for (k,v) in ohai_ds.items():
if type(v) == str or type(v) == unicode:
k2 = "ohai_%s" % k.replace('-', '_')
setup_options[k2] = v