Merge pull request #11919 from dragon2611/master

external: pool and metadata ec pools were reversed in scripts

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"]
                         ),

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"