From c281ce635a2fe0d1dc4de3df5076f2bb23fa98fc Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 2 Mar 2012 19:48:37 -0500 Subject: [PATCH] Still seeing some weirdness from ohai but we can probably simplify this until we figure out what that is. --- ohai | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/ohai b/ohai index 9ad520eead9..3b6f3ae144c 100755 --- a/ohai +++ b/ohai @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/bin/bash # (c) 2012, Michael DeHaan # @@ -18,17 +18,4 @@ # along with Ansible. If not, see . # -# requires 'ohai' to be installed - -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)) +/usr/bin/ohai