ceph-common: remove rh_storage requirements from install_on_redhat task

Signed-off-by: Alfredo Deza <adeza@redhat.com> Resolves: rhbz#1339096
ceph · May 24, 2016 · 068e5d8 · 068e5d8
1 parent 921c4c8
commit 068e5d8
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -44,7 +44,6 @@
     - mon_group_name in group_names
     - ansible_pkg_mgr == "yum"
     - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
-      or ceph_stable_rh_storage
       or ceph_dev
       or ceph_origin == "distro"
 
@@ -57,7 +56,6 @@
     - ansible_pkg_mgr == "dnf"
     - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
       or ceph_origin == "distro"
-      or ceph_stable_rh_storage
       or ceph_dev
 
 - name: install distro or red hat storage ceph osd
@@ -69,7 +67,6 @@
     - ansible_pkg_mgr == "yum"
     - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
       or ceph_origin == "distro"
-      or ceph_stable_rh_storage
       or ceph_dev
 
 - name: install distro or red hat storage ceph osd
@@ -81,15 +78,14 @@
     - ansible_pkg_mgr == "dnf"
     - (ceph_stable and ceph_stable_release not in ceph_stable_releases)
       or ceph_origin == "distro"
-      or ceph_stable_rh_storage
       or ceph_dev
 
 - name: install distro or red hat storage ceph mds
   yum:
     name: "ceph-mds"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
+    (ceph_origin == "distro" or ceph_dev or
      (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     mds_group_name in group_names and
     ansible_pkg_mgr == "yum"
@@ -99,7 +95,7 @@
     name: "ceph-mds"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
+    (ceph_origin == "distro" or ceph_dev or
      (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     mds_group_name in group_names and
     ansible_pkg_mgr == "dnf"
@@ -109,7 +105,7 @@
     name: "ceph-base"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
+    (ceph_origin == "distro" or ceph_dev or
      (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     client_group_name in group_names and
     ansible_pkg_mgr == "yum"
@@ -119,7 +115,7 @@
     name: "ceph-base"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
-    (ceph_origin == "distro" or ceph_stable_rh_storage or ceph_dev or
+    (ceph_origin == "distro" or ceph_dev or
      (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
     client_group_name in group_names and
     ansible_pkg_mgr == "dnf"