From d79ba6f2aad34713416e2bbdd1fbd625d282d042 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 28 Jul 2012 17:07:55 -0400 Subject: [PATCH] Port the ohai module over, while this is actually *longer* now, not transferring the args file makes this much faster. --- library/ohai | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/library/ohai b/library/ohai index e4cf0272651..b0e8fb4bbfc 100755 --- a/library/ohai +++ b/library/ohai @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/python # (c) 2012, Michael DeHaan # @@ -18,5 +18,30 @@ # along with Ansible. If not, see . # -/usr/bin/logger -t ansible-ohai Invoked as-is -/usr/bin/ohai +import subprocess + +def get_facter_data(): + + p = subprocess.Popen(["/usr/bin/env", "ohai"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (out, err) = p.communicate() + rc = p.returncode + return rc, out, err + +def main(): + + module = AnsibleModule( + argument_spec = dict() + ) + + rc, out, err = get_facter_data() + if rc != 0: + module.fail_json(msg=err) + else: + module.exit_json(**json.loads(out)) + +# this is magic, see lib/ansible/module_common.py +#<> + +main() + +