Adds a use_server_package_split var

This will allow a user to conditionally install the ceph package on rpm
based systems. Installing this package is not required or wanted in
versions passed infernalis.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit f81140d21f5c77965c4438ba752bb174bf6bec70)

diff --git a/group_vars/all.sample b/group_vars/all.sample
index ce04ff2e649ebeb4ef47d711580e242f6113ef1a..c9034294525fbd5a92f0e8687d65628f4db6d7f4 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -38,6 +38,10 @@ dummy:
 # "state=latest".
 #upgrade_ceph_packages: False
 
+# If this is false then the 'ceph' package will be installed on rpm systems, which
+# is not needed for versions after infernalis.
+#use_server_package_split: true
+
 # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\
 
 #debian_package_dependencies:

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 568e9d2f7afaa24a0da833e4a0dd2e05b98249cd..47a48e76b1ae43932c5e78655d1aa94237999b15 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -30,6 +30,10 @@ check_firewall: True
 # "state=latest".
 upgrade_ceph_packages: False
 
+# If this is false then the 'ceph' package will be installed on rpm systems, which
+# is not needed for versions after infernalis.
+use_server_package_split: true
+
 # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\
 
 debian_package_dependencies:
@@ -367,3 +371,4 @@ docker: false
 # Do not comment the variable mon_containerized_deployment_with_kv here. This variable is being used
 # by ceph.conf.j2 template. so it should always be defined
 mon_containerized_deployment_with_kv: false
+

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 45446e4ac6ce603e8b0f17288ff6ee51afd1656a..ec46b3cfe045b7bc03dec859e0a063612834844c 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -34,7 +34,7 @@
   yum:
     name: ceph
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: not ceph_stable_rh_storage
+  when: not use_server_package_split
 
 # include Infernalis in the set of releases that do not have
 # a separate ceph-mon package or ceph-osd package
@@ -45,11 +45,8 @@
 
 - name: install distro or red hat storage ceph mon
   yum:
-    name: "{{ item }}"
+    name: "ceph-mon"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  with_items:
-    - ceph
-    - ceph-mon
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage or
      (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
@@ -58,11 +55,8 @@
 
 - name: install distro or red hat storage ceph mon
   dnf:
-    name: "{{ item }}"
+    name: "ceph-mon"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  with_items:
-    - ceph
-    - ceph-mon
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage or
      (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
@@ -71,11 +65,8 @@
 
 - name: install distro or red hat storage ceph osd
   yum:
-    name: "{{ item }}"
+    name: "ceph-osd"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  with_items:
-    - ceph
-    - ceph-osd
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage or
      (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
@@ -84,11 +75,8 @@
 
 - name: install distro or red hat storage ceph osd
   dnf:
-    name: "{{ item }}"
+    name: "ceph-osd"
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  with_items:
-    - ceph
-    - ceph-osd
   when:
     (ceph_origin == "distro" or ceph_stable_rh_storage or
      (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and