From 8bdabf85a85693605e1124ca2c5dec4bc8eab5db Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 16 Mar 2023 15:03:04 +0000 Subject: [PATCH] external: pool and metadata ec pools were reversed in scripts Pool and Metadata Pool Appear to be reversed. dataPool needs to contain the EC Data pool pool needs to contain the Metadata Pool Closes: https://github.com/rook/rook/issues/11918 Signed-off-by: Matt P --- deploy/examples/create-external-cluster-resources.py | 4 ++-- deploy/examples/import-external-cluster.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/examples/create-external-cluster-resources.py b/deploy/examples/create-external-cluster-resources.py index 51d53e6fa..70150876a 100644 --- a/deploy/examples/create-external-cluster-resources.py +++ b/deploy/examples/create-external-cluster-resources.py @@ -1545,8 +1545,8 @@ class RadosJSON: "name": "ceph-rbd", "kind": "StorageClass", "data": { - "dataPool": self.out_map["RBD_METADATA_EC_POOL_NAME"], - "pool": self.out_map["RBD_POOL_NAME"], + "dataPool": self.out_map["RBD_POOL_NAME"], + "pool": self.out_map["RBD_METADATA_EC_POOL_NAME"], "csi.storage.k8s.io/provisioner-secret-name": "rook-{}".format( self.out_map["CSI_RBD_PROVISIONER_SECRET_NAME"] ), diff --git a/deploy/examples/import-external-cluster.sh b/deploy/examples/import-external-cluster.sh index 15f3479dc..d1b9e7398 100644 --- a/deploy/examples/import-external-cluster.sh +++ b/deploy/examples/import-external-cluster.sh @@ -200,8 +200,8 @@ metadata: provisioner: $RBD_PROVISIONER parameters: clusterID: $CLUSTER_ID_RBD - pool: $RBD_POOL_NAME - dataPool: $RBD_METADATA_EC_POOL_NAME + pool: $RBD_METADATA_EC_POOL_NAME + dataPool: $RBD_POOL_NAME imageFormat: "2" imageFeatures: $ROOK_RBD_FEATURES csi.storage.k8s.io/provisioner-secret-name: "rook-$CSI_RBD_PROVISIONER_SECRET_NAME"