external: fix rados namespace sc name
Currently, the sc name is hardcoded, in future if we support multiple rados namespace per tenant we need a variable name updating sc names to contain rados-namespace name ocs pr: https://github.com/red-hat-storage/ocs-operator/pull/2955 Signed-off-by: parth-gr <partharora1010@gmail.com>
This commit is contained in:
1 parent
54c2ba5071
commit
61de34a11d
2 files changed
+3
-1
No files matched your search
@@ -1896,7 +1896,7 @@ class RadosJSON:
|
||||
)
|
||||
json_out.append(
|
||||
{
|
||||
"name": "ceph-rbd-rados-namespace",
|
||||
"name": f"ceph-rbd-rados-namespace-{self.out_map['RADOS_NAMESPACE']}",
|
||||
"kind": "StorageClass",
|
||||
"data": {
|
||||
"pool": self.out_map["RBD_POOL_NAME"],
|
||||
|
||||
@@ -127,11 +127,13 @@ function importClusterID() {
|
||||
createRadosNamespaceCR
|
||||
timeout 20 sh -c "until [ $($KUBECTL -n "$NAMESPACE" get CephBlockPoolRadosNamespace/"$RADOS_NAMESPACE" -o jsonpath='{.status.phase}' | grep -c "Ready") -eq 1 ]; do echo "waiting for radosNamespace to get created" && sleep 1; done"
|
||||
CLUSTER_ID_RBD=$($KUBECTL -n "$NAMESPACE" get cephblockpoolradosnamespace.ceph.rook.io/"$RADOS_NAMESPACE" -o jsonpath='{.status.info.clusterID}')
|
||||
RBD_STORAGE_CLASS_NAME=ceph-rbd-$RADOS_NAMESPACE
|
||||
fi
|
||||
if [ -n "$SUBVOLUME_GROUP" ]; then
|
||||
createSubvolumeGroupCR
|
||||
timeout 20 sh -c "until [ $($KUBECTL -n "$NAMESPACE" get CephFilesystemSubVolumeGroup/"$SUBVOLUME_GROUP" -o jsonpath='{.status.phase}' | grep -c "Ready") -eq 1 ]; do echo "waiting for radosNamespace to get created" && sleep 1; done"
|
||||
CLUSTER_ID_CEPHFS=$($KUBECTL -n "$NAMESPACE" get cephfilesystemsubvolumegroup.ceph.rook.io/"$SUBVOLUME_GROUP" -o jsonpath='{.status.info.clusterID}')
|
||||
CEPHFS_STORAGE_CLASS_NAME=cephfs-$SUBVOLUME_GROUP
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user