ceph-mgr: Add extra module packages

Since Nautilus there's mgr extra modules not present in ceph-mgr
package but in dedicated packages.

Resolves: #3860

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 86315272c75f62dd9fa07eec91b9e6f05f54c284)

diff --git a/group_vars/mgrs.yml.sample b/group_vars/mgrs.yml.sample
index 1a85a38fdcb01497fa7821d243ccdc4911a6ab21..2112ade7e1f290c720f408ac1c81e89de9f0b894 100644 (file)
--- a/group_vars/mgrs.yml.sample
+++ b/group_vars/mgrs.yml.sample
@@ -24,6 +24,15 @@ dummy:
 # and replace CEPH_VERSION with your current Ceph version, e,g: 'mimic'
 #ceph_mgr_modules: []
 
+############
+# PACKAGES #
+############
+# Ceph mgr packages to install, ceph-mgr + extra module packages.
+#ceph_mgr_packages:
+#  - ceph-mgr
+#  - ceph-mgr-dashboard
+#  - ceph-mgr-diskprediction-local
+
 
 ##########
 # DOCKER #

diff --git a/roles/ceph-mgr/defaults/main.yml b/roles/ceph-mgr/defaults/main.yml
index db8ee45bc26d52b669e48e82a27947c69930c33e..68a62dbbec323fde2b2ca0f15372dd5ba263b837 100644 (file)
--- a/roles/ceph-mgr/defaults/main.yml
+++ b/roles/ceph-mgr/defaults/main.yml
@@ -16,6 +16,15 @@ copy_admin_key: false
 # and replace CEPH_VERSION with your current Ceph version, e,g: 'mimic'
 ceph_mgr_modules: []
 
+############
+# PACKAGES #
+############
+# Ceph mgr packages to install, ceph-mgr + extra module packages.
+ceph_mgr_packages:
+  - ceph-mgr
+  - ceph-mgr-dashboard
+  - ceph-mgr-diskprediction-local
+
 
 ##########
 # DOCKER #

diff --git a/roles/ceph-mgr/tasks/pre_requisite.yml b/roles/ceph-mgr/tasks/pre_requisite.yml
index 78f74400b427315133d28c83ee4b133820edd9df..1dcd7c43b3408a6687ce0436cdef2c5984bb0fdf 100644 (file)
--- a/roles/ceph-mgr/tasks/pre_requisite.yml
+++ b/roles/ceph-mgr/tasks/pre_requisite.yml
@@ -1,16 +1,16 @@
 ---
-- name: install ceph-mgr package on RedHat or SUSE
+- name: install ceph-mgr packages on RedHat or SUSE
   package:
-    name: ceph-mgr
+    name: '{{ ceph_mgr_packages }}'
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   register: result
   until: result is succeeded
   when:
     - ansible_os_family in ['RedHat', 'Suse']
 
-- name: install ceph mgr for debian
+- name: install ceph-mgr packages for debian
   apt:
-    name: ceph-mgr
+    name: '{{ ceph_mgr_packages }}'
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
     default_release: "{{ ceph_stable_release_uca | default('') if ceph_origin == 'repository' and ceph_repository == 'uca' else ''}}{{ ansible_distribution_release ~ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else '' }}"
   register: result