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 <tonay@ibm.com>

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 8cfbef8c76baa87fe4048a67b0e4cae723bfb50a..ba33bb8a1d41b87b34a11f8afc6dbad5bebfceda 100644 (file)
--- a/infrastructure-playbooks/cephadm-adopt.yml
+++ b/infrastructure-playbooks/cephadm-adopt.yml
@@ -455,7 +455,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: