ceph-mgr: don't install dashboard pkg by default

This is a partial backport of 2547ab60.

We are currently installing the ceph-mgr-dashboard package even if the
dashboard_enabled variable is set to false.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/mgrs.yml.sample b/group_vars/mgrs.yml.sample
index 55a01f41d172880a48aba882c34b3ca80d77ad32..6acdb723549d3876c4839016c6a56bcf39bfb3e3 100644 (file)
--- a/group_vars/mgrs.yml.sample
+++ b/group_vars/mgrs.yml.sample
@@ -31,7 +31,6 @@ dummy:
 # Ceph mgr packages to install, ceph-mgr + extra module packages.
 #ceph_mgr_packages:
 #  - ceph-mgr
-#  - ceph-mgr-dashboard
 #  - ceph-mgr-diskprediction-local
 
 

diff --git a/roles/ceph-mgr/defaults/main.yml b/roles/ceph-mgr/defaults/main.yml
index 7455043d501a466f7b7a517973b31e2958f99b54..dacedb02c60590cd09cf75304b5cb8daeed781ca 100644 (file)
--- a/roles/ceph-mgr/defaults/main.yml
+++ b/roles/ceph-mgr/defaults/main.yml
@@ -23,7 +23,6 @@ ceph_mgr_modules: []
 # Ceph mgr packages to install, ceph-mgr + extra module packages.
 ceph_mgr_packages:
   - ceph-mgr
-  - ceph-mgr-dashboard
   - ceph-mgr-diskprediction-local
 
 

diff --git a/roles/ceph-mgr/tasks/pre_requisite.yml b/roles/ceph-mgr/tasks/pre_requisite.yml
index 6c441ea3b3399f5f547e09857331fe3ad8272835..5cf185479bb4ecf353137b019e3a88cd0afbc980 100644 (file)
--- a/roles/ceph-mgr/tasks/pre_requisite.yml
+++ b/roles/ceph-mgr/tasks/pre_requisite.yml
@@ -6,6 +6,11 @@
     - dashboard_enabled | bool
     - ansible_facts['distribution'] == 'RedHat'
 
+- name: set_fact ceph_mgr_packages for dashboard
+  set_fact:
+    ceph_mgr_packages: "{{ ceph_mgr_packages | union(['ceph-mgr-dashboard']) }}"
+  when: dashboard_enabled | bool
+
 - name: install ceph-mgr packages on RedHat or SUSE
   package:
     name: '{{ ceph_mgr_packages }}'