From: Zack Cerza <zack@redhat.com>
Date: Wed, 20 Jan 2016 17:17:18 +0000 (-0700)
Subject: common: Split out tasks into yum_systems.yml
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=082ccf2faa9c4b8695a79c9938d2d919060b0e9a;p=ceph-cm-ansible.git

common: Split out tasks into yum_systems.yml

Similar to how the testnodes role works. apt_systems.yml will be added
when it's needed.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 2726361..bfb22a9 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -14,22 +14,11 @@
     # We need these vars for the entitlements tag to work
     - entitlements
 
-# configure Red Hat entitlements with subscription-manager
-- include: rhel-entitlements.yml
-  when: ansible_distribution == 'RedHat'
-  tags:
-    - entitlements
+# configure things specific to yum systems
+- include: yum_systems.yml
+  when: ansible_pkg_mgr == "yum"
 
 # configure Kerberos
 - include: kerberos.yml
   tags:
     - kerberos
-
-# create and manage epel.repo
-- include: epel.yml
-  when:
-    ansible_distribution == "CentOS" or
-    ansible_distribution == 'RedHat'
-  tags:
-    - epel
-    - repos
diff --git a/roles/common/tasks/yum_systems.yml b/roles/common/tasks/yum_systems.yml
new file mode 100644
index 0000000..fce55c8
--- /dev/null
+++ b/roles/common/tasks/yum_systems.yml
@@ -0,0 +1,15 @@
+---
+# configure Red Hat entitlements with subscription-manager
+- include: rhel-entitlements.yml
+  when: ansible_distribution == 'RedHat'
+  tags:
+    - entitlements
+
+# create and manage epel.repo
+- include: epel.yml
+  when:
+    ansible_distribution == "CentOS" or
+    ansible_distribution == 'RedHat'
+  tags:
+    - epel
+    - repos