Still seeing some weirdness from ohai but we can probably simplify

this until we figure out what that is.
reviewable/pr18780/r1
Michael DeHaan 13 years ago
parent c3a0cfe4f3
commit c281ce635a

17
ohai

@ -1,4 +1,4 @@
#!/usr/bin/python #!/bin/bash
# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com> # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
# #
@ -18,17 +18,4 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# #
# requires 'ohai' to be installed /usr/bin/ohai
try:
import json
except ImportError:
import simplejson as json
import subprocess
cmd = subprocess.Popen("/usr/bin/ohai", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
out, err = cmd.communicate()
# try to cleanup the JSON, for some reason facter --json doesn't need this hack
print json.dumps(json.loads(out))

Loading…
Cancel
Save