From 0a9a91b662fff95a600d94b7cad01463524ce7db Mon Sep 17 00:00:00 2001 From: Teoman ONAY Date: Fri, 4 Aug 2023 14:37:39 +0200 Subject: [PATCH] cephadm-adopt: Fixes rbd-mirror regression 779523f86f4659283441ece8af2d4a4dbe8140b4 introduced a regression related to rbdmirrors tasks. They were executed while ceph_rbd_mirror_remot_* variables were not set. Signed-off-by: Teoman ONAY (cherry picked from commit 18cd35bad53231b9afdde8aec35c2b8a46c928e4) --- infrastructure-playbooks/cephadm-adopt.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml index 296cf5c47..a448ce174 100644 --- a/infrastructure-playbooks/cephadm-adopt.yml +++ b/infrastructure-playbooks/cephadm-adopt.yml @@ -464,7 +464,8 @@ - name: store existing rbd mirror peers in monitor config store when: - ceph_rbd_mirror_configure | default(True) | bool - - ceph_rbd_mirror_remote_user is undefined + - ceph_rbd_mirror_remote_user is defined + - ceph_rbd_mirror_remote_cluster is defined block: - name: import ceph-defaults import_role: