From b199bdcfabf0567277b6c72267c03d5387e0175b Mon Sep 17 00:00:00 2001
From: Ben England <bengland@redhat.com>
Date: Tue, 5 Apr 2016 21:11:37 -0400
Subject: [PATCH] fix when clauses for installation of ceph RPM

---
 .../tasks/installs/install_on_redhat.yml      | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 5a346e75d..b079a4dbe 100644
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -44,11 +44,10 @@
     - ceph
     - ceph-mon
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     mon_group_name in group_names and
-    ansible_pkg_mgr == "yum" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "yum"
 
 - name: install distro or red hat storage ceph mon
   dnf:
@@ -58,11 +57,10 @@
     - ceph
     - ceph-mon
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     mon_group_name in group_names and
-    ansible_pkg_mgr == "dnf" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "dnf"
 
 - name: install distro or red hat storage ceph osd
   yum:
@@ -72,11 +70,10 @@
     - ceph
     - ceph-osd
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     osd_group_name in group_names and
-    ansible_pkg_mgr == "yum" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "yum"
 
 - name: install distro or red hat storage ceph osd
   dnf:
@@ -86,11 +83,10 @@
     - ceph
     - ceph-osd
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage) and
+    (ceph_origin == "distro" or ceph_stable_rh_storage or
+     (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     osd_group_name in group_names and
-    ansible_pkg_mgr == "dnf" and
-    ceph_stable and
-    ceph_stable_release not in ceph_stable_releases
+    ansible_pkg_mgr == "dnf"
 
 - name: install ceph-test
   yum: