From: Sébastien Han <seb@redhat.com>
Date: Tue, 15 Mar 2016 15:35:29 +0000 (+0100)
Subject: ceph-common: fix ceph install for centos distros
X-Git-Tag: v1.0.3~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1764b5337ff6194e6aa200a9094fb10ddd100a94;p=ceph-ansible.git

ceph-common: fix ceph install for centos distros

closes: #616

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 670e529ef..da0ce967e 100644
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -46,7 +46,9 @@
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage) and
     mon_group_name in group_names and
-    ansible_pkg_mgr == "yum"
+    ansible_pkg_mgr == "yum" and
+    ceph_stable and
+    ceph_stable_release not in ceph_stable_releases
 
 - name: install distro or red hat storage ceph mon
   dnf:
@@ -58,7 +60,9 @@
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage) and
     mon_group_name in group_names and
-    ansible_pkg_mgr == "dnf"
+    ansible_pkg_mgr == "dnf" and
+    ceph_stable and
+    ceph_stable_release not in ceph_stable_releases
 
 - name: install distro or red hat storage ceph osd
   yum:
@@ -70,7 +74,9 @@
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage) and
     osd_group_name in group_names and
-    ansible_pkg_mgr == "yum"
+    ansible_pkg_mgr == "yum" and
+    ceph_stable and
+    ceph_stable_release not in ceph_stable_releases
 
 - name: install distro or red hat storage ceph osd
   dnf:
@@ -82,7 +88,9 @@
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage) and
     osd_group_name in group_names and
-    ansible_pkg_mgr == "dnf"
+    ansible_pkg_mgr == "dnf" and
+    ceph_stable and
+    ceph_stable_release not in ceph_stable_releases
 
 - name: install ceph-test
   yum: