From eba580320c9aa4e2ca158cf163dab85d71dd3492 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 19 Jul 2021 15:19:23 -0400 Subject: [PATCH] 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 --- group_vars/mgrs.yml.sample | 1 - roles/ceph-mgr/defaults/main.yml | 1 - roles/ceph-mgr/tasks/pre_requisite.yml | 5 +++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/group_vars/mgrs.yml.sample b/group_vars/mgrs.yml.sample index 55a01f41d..6acdb7235 100644 --- 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 7455043d5..dacedb02c 100644 --- 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 6c441ea3b..5cf185479 100644 --- 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 }}' -- 2.39.5