From dcb690bab27f4757d3f20496591a477f3f489549 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 14 Nov 2022 12:29:37 +0100 Subject: [PATCH] cephadm-adopt: fix rbd-mirror adoption The recent rbdmirror refactor introduced a regression in the cephadm-adopt playbook. Given that the rbd-mirror peer addition is now done by using the monitor config-key store method during the cluster deployment, we can drop this play from the cephadm-adopt.yml playbook. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2140569 Signed-off-by: Guillaume Abrioux (cherry picked from commit c3fae04b8d234c84e4a5c7ca4a390ecfa3d1c1d5) --- infrastructure-playbooks/cephadm-adopt.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index d4fa4b8bd..cae15b189 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -462,7 +462,9 @@ gather_facts: true tasks: - name: store existing rbd mirror peers in monitor config store - when: ceph_rbd_mirror_configure | default(False) | bool + when: + - ceph_rbd_mirror_configure | default(True) | bool + - ceph_rbd_mirror_remote_user is undefined block: - name: import ceph-defaults import_role: