diff --git a/test/addons/rbd-mirror/start b/test/addons/rbd-mirror/start index ab8028a4d..55b6192ff 100755 --- a/test/addons/rbd-mirror/start +++ b/test/addons/rbd-mirror/start @@ -111,6 +111,10 @@ def configure_rbd_mirroring(cluster, peer_info): yaml = template.substitute(cluster=cluster) kubectl.apply("--filename=-", input=yaml, context=cluster) + template = drenv.template("start-data/vgrc-sample.yaml") + yaml = template.substitute(cluster=cluster, pool=POOL_NAME) + kubectl.apply("--filename=-", input=yaml, context=cluster) + print(f"Apply rbd mirror to cluster '{cluster}'") kubectl.apply("--kustomize=start-data", context=cluster) diff --git a/test/addons/rbd-mirror/start-data/kustomization.yaml b/test/addons/rbd-mirror/start-data/kustomization.yaml index 1a51e23cc..d216a472e 100644 --- a/test/addons/rbd-mirror/start-data/kustomization.yaml +++ b/test/addons/rbd-mirror/start-data/kustomization.yaml @@ -3,7 +3,6 @@ --- resources: -- vgrc-sample.yaml - rbd-mirror.yaml namespace: rook-ceph diff --git a/test/addons/rbd-mirror/start-data/vgrc-sample.yaml b/test/addons/rbd-mirror/start-data/vgrc-sample.yaml index e4eae360d..2f44aa193 100644 --- a/test/addons/rbd-mirror/start-data/vgrc-sample.yaml +++ b/test/addons/rbd-mirror/start-data/vgrc-sample.yaml @@ -6,9 +6,14 @@ apiVersion: replication.storage.openshift.io/v1alpha1 kind: VolumeGroupReplicationClass metadata: name: vgrc-sample + labels: + ramendr.openshift.io/storageid: rook-ceph-$cluster-1 + ramendr.openshift.io/replicationid: rook-ceph-replication-1 spec: provisioner: rook-ceph.rbd.csi.ceph.com parameters: - replication.storage.openshift.io/replication-secret-name: rook-csi-rbd-provisioner - replication.storage.openshift.io/replication-secret-namespace: rook-ceph + clusterID: rook-ceph + pool: $pool + replication.storage.openshift.io/group-replication-secret-name: rook-csi-rbd-provisioner + replication.storage.openshift.io/group-replication-secret-namespace: rook-ceph schedulingInterval: 1m