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 <gabrioux@redhat.com>
(cherry picked from commit c3fae04b8d234c84e4a5c7ca4a390ecfa3d1c1d5)

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