From 8d25b4305e79a4ad675b45b268d4cb35a158e3d9 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 16 Mar 2021 16:33:27 +0100 Subject: [PATCH] adopt: convert legacy grafana-server groupname early This is a follow up on PR #6332 cephadm-adopt.yml playbook is affected by the same bug Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1938658 Signed-off-by: Guillaume Abrioux (cherry picked from commit af95595c82963a78966b52f3cec31e35cbde89bf) --- infrastructure-playbooks/cephadm-adopt.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 7cad008df..a47ee3f5d 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -23,6 +23,16 @@ 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 and prepare system for cephadm hosts: - "{{ mon_group_name|default('mons') }}"