From e30fdeba3c3e3bc74e8f9f6d4e7badda4781b65c Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 29 Jul 2022 13:19:13 +0200 Subject: [PATCH] purge-dashboard: check for legacy group name 'grafana-server' When using the legacy group name 'grafana-server', this playbook will run but won't remove properly all monitoring resources as expected. Fixes: #7265 Signed-off-by: Guillaume Abrioux (cherry picked from commit a9cb444be1f1b601d96ad8ff8970ac2d487ca17e) --- infrastructure-playbooks/purge-dashboard.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/infrastructure-playbooks/purge-dashboard.yml b/infrastructure-playbooks/purge-dashboard.yml index a9e4fbc25f..b4a38bef22 100644 --- a/infrastructure-playbooks/purge-dashboard.yml +++ b/infrastructure-playbooks/purge-dashboard.yml @@ -31,6 +31,17 @@ invoking the playbook" when: ireallymeanit != 'yes' + - name: import_role ceph-defaults + import_role: + name: ceph-defaults + + - name: check if a legacy grafana-server group exists + import_role: + name: ceph-facts + tasks_from: convert_grafana_server_group_name.yml + when: groups.get((grafana_server_group_name | default('grafana-server')), []) | length > 0 + + - name: gather facts on all hosts hosts: - "{{ mon_group_name|default('mons') }}"