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>
(cherry picked from commit 18cd35bad53231b9afdde8aec35c2b8a46c928e4)

diff --git a/infrastructure-playbooks/cephadm-adopt.yml b/infrastructure-playbooks/cephadm-adopt.yml
index 296cf5c47d87633d9ef727fb26725f916d2e3d91..a448ce174919e09f90e428a3904dd14780dd97a7 100644 (file)
--- 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: