Updating the clustertype and platform type as per comment

Signed-off-by: suchita-g <[email protected]>
red-hat-storage · Nov 14, 2023 · 3b36c69 · 3b36c69
1 parent 5234904
commit 3b36c69
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/...c/client_bm_upi_1az_rhcos_nvme_3m_3w.yaml → ...i_pc/client_bm_upi_1az_rhcos_nvme_3w.yaml b/...c/client_bm_upi_1az_rhcos_nvme_3m_3w.yaml → ...i_pc/client_bm_upi_1az_rhcos_nvme_3w.yaml
@@ -1,13 +1,9 @@
 ---
-DEPLOYMENT:
-  allow_lower_instance_requirements: false
-  local_storage: true
 ENV_DATA:
-  platform: 'baremetal'
+  platform: 'fhci_baremetal'
   cluster_type: 'hci_client'
   cluster_namespace: "openshift-storage-client"
   deployment_type: 'upi'
   worker_replicas: 3
-  master_replicas: 3
   mon_type: 'hostpath'
   osd_type: 'nvme'
diff --git a/conf/deployment/fusion_hci_pc/provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml b/conf/deployment/fusion_hci_pc/provider_bm_upi_1az_rhcos_nvme_3m_3w.yaml
@@ -3,7 +3,7 @@ DEPLOYMENT:
   allow_lower_instance_requirements: false
   local_storage: true
 ENV_DATA:
-  platform: 'baremetal'
+  platform: 'fhci_baremetal'
   cluster_type: 'provider'
   cluster_namespace: "openshift-storage"
   deployment_type: 'upi'

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5862,7 +5862,10 @@ def patch_consumer_toolbox_with_secret():
 
     # Patch the rook-ceph-tools deployment of all consumer clusters
     for cluster in ocsci_config.clusters:
-        if cluster.ENV_DATA.get("cluster_type") == "consumer":
+        if (
+            cluster.ENV_DATA.get("cluster_type") == "consumer"
+            or cluster.ENV_DATA.get("cluster_type") == "hci_client"
+        ):
             ocsci_config.switch_ctx(cluster.MULTICLUSTER["multicluster_index"])
             consumer_tools_pod = get_ceph_tools_pod()