From 0166392cfea4b75b79805d5be242d2eba1edb227 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 3 Apr 2015 12:00:33 -0400
Subject: [PATCH] Collect packge info in the repo, not in python

There is no need for a python fact collector, just do it in ansible
commands instead
---
 contrib/ansible/library/rpm_facts.py        | 37 ---------------------
 contrib/ansible/roles/common/tasks/main.yml |  4 +--
 contrib/ansible/roles/common/tasks/rpm.yml  | 30 +++++++++++++++++
 3 files changed, 32 insertions(+), 39 deletions(-)
 delete mode 100644 contrib/ansible/library/rpm_facts.py
 create mode 100644 contrib/ansible/roles/common/tasks/rpm.yml

diff --git a/contrib/ansible/library/rpm_facts.py b/contrib/ansible/library/rpm_facts.py
deleted file mode 100644
index 292197e6677..00000000000
--- a/contrib/ansible/library/rpm_facts.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/python
-
-import subprocess
-import re
-
-def main():
-    module = AnsibleModule(
-        argument_spec = dict(
-        ),
-    )
-
-    facts = {}
-
-    result = {}
-    result['rc'] = 0
-    result['changed'] = False
-    result['ansible_facts'] = facts
-
-    args = ("rpm", "-q", "firewalld")
-    popen = subprocess.Popen(args, stdout=subprocess.PIPE)
-    rc = popen.wait()
-    facts['has_firewalld'] = False
-    if rc == 0:
-        facts['has_firewalld'] = True
-
-    args = ("rpm", "-q", "iptables-services")
-    popen = subprocess.Popen(args, stdout=subprocess.PIPE)
-    rc = popen.wait()
-    facts['has_iptables'] = False
-    if rc == 0:
-        facts['has_iptables'] = True
-
-    module.exit_json(**result)
-
-# import module snippets
-from ansible.module_utils.basic import *
-main()
diff --git a/contrib/ansible/roles/common/tasks/main.yml b/contrib/ansible/roles/common/tasks/main.yml
index 081b2fe5458..5404be01616 100644
--- a/contrib/ansible/roles/common/tasks/main.yml
+++ b/contrib/ansible/roles/common/tasks/main.yml
@@ -13,6 +13,6 @@
     is_atomic: true
   when: s.stat.exists
 
-- name: Collect fact about what RPM's are installed
-  rpm_facts:
+# collect information about what packages are installed
+- include: rpm.yml
   when: ansible_pkg_mgr == "yum"
diff --git a/contrib/ansible/roles/common/tasks/rpm.yml b/contrib/ansible/roles/common/tasks/rpm.yml
new file mode 100644
index 00000000000..959be43dbdf
--- /dev/null
+++ b/contrib/ansible/roles/common/tasks/rpm.yml
@@ -0,0 +1,30 @@
+---
+- name: Determine if firewalld installed
+  command: "rpm -q firewalld"
+  register: s
+  changed_when: false
+  failed_when: false
+
+- name: Init the has_firewalld fact
+  set_fact:
+    has_firewalld: false
+
+- name: Set the has_firewalld fact
+  set_fact:
+    has_firewalld: true
+  when: s.rc == 0
+
+- name: Determine if iptables-services installed
+  command: "rpm -q iptables-services"
+  register: s
+  changed_when: false
+  failed_when: false
+
+- name: Init the has_iptables fact
+  set_fact:
+    has_iptables: false
+
+- name: Set the has_iptables fact
+  set_fact:
+    has_iptables: true
+  when: s.rc == 0