Set storage-type to tier0 for SNO node

openshift · Apr 5, 2024 · 08cc5f0 · 08cc5f0
1 parent f88d2dc
commit 08cc5f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...perator/step-registry/upi/deprovision/powervs/sno/upi-deprovision-powervs-sno-commands.sh b/...perator/step-registry/upi/deprovision/powervs/sno/upi-deprovision-powervs-sno-commands.sh
@@ -38,12 +38,12 @@ export PATH=$PATH:/tmp/bin
 
 # IBM cloud login
 ibmcloud config --check-version=false
-echo | ibmcloud login --apikey @"/etc/sno-power-credentials/.powercreds"
+echo | ibmcloud login --apikey @"/etc/sno-power-credentials/.powercreds" --no-region
 
 # Installing required ibmcloud plugins
 echo "$(date) Installing required ibmcloud plugins"
-ibmcloud plugin install power-iaas
-ibmcloud plugin install cis
+ibmcloud plugin install -f power-iaas
+ibmcloud plugin install -f cis
 
 # Set target powervs and cis service instance
 ibmcloud pi ws tg ${POWERVS_INSTANCE_CRN}

diff --git a/ci-operator/step-registry/upi/install/powervs/sno/upi-install-powervs-sno-commands.sh b/ci-operator/step-registry/upi/install/powervs/sno/upi-install-powervs-sno-commands.sh
@@ -24,8 +24,8 @@ setup_env() {
 
   # Installing required ibmcloud plugins
   echo "$(date) Installing required ibmcloud plugins"
-  ibmcloud plugin install power-iaas
-  ibmcloud plugin install cis
+  ibmcloud plugin install -f power-iaas
+  ibmcloud plugin install -f cis
 
   # Set target powervs and cis service instance
   ibmcloud pi ws tg ${POWERVS_INSTANCE_CRN}
@@ -39,7 +39,7 @@ setup_env() {
 create_sno_node() {
   # Creating VSI in PowerVS instance
   echo "$(date) Creating VSI in PowerVS instance"
-  ibmcloud pi ins create ${POWERVS_VSI_NAME} --image ${POWERVS_IMAGE} --subnets ${POWERVS_NETWORK} --memory ${POWERVS_VSI_MEMORY} --processors ${POWERVS_VSI_PROCESSORS} --processor-type ${POWERVS_VSI_PROC_TYPE} --sys-type ${POWERVS_VSI_SYS_TYPE}
+  ibmcloud pi ins create ${POWERVS_VSI_NAME} --image ${POWERVS_IMAGE} --subnets ${POWERVS_NETWORK} --memory ${POWERVS_VSI_MEMORY} --processors ${POWERVS_VSI_PROCESSORS} --processor-type ${POWERVS_VSI_PROC_TYPE} --sys-type ${POWERVS_VSI_SYS_TYPE}  --storage-tier tier0
 
   instance_id=$(ibmcloud pi ins ls --json | jq -r --arg serverName ${POWERVS_VSI_NAME} '.pvmInstances[] | select (.name == $serverName ) | .id')
 
@@ -232,7 +232,7 @@ create_cluster() {
 register_infra() {
   echo "Register the cluster: \${NEW_CLUSTER_ID}"
   cat cluster-register-template.json | envsubst > \${CONFIG_DIR}/cluster-register.json
- 
+
   curl -s -X POST "\${API_URL}/infra-envs" \
       -H "Content-Type: application/json" \
       -H "Authorization: Bearer \${API_TOKEN}" \
@@ -329,7 +329,7 @@ wait_install_complete() {
         pre_status=\${status}
       fi
       if [[ \${status} == "installed" ]]; then
-        echo "Done of OCP installation" 
+        echo "Done of OCP installation"
         break
       fi
       sleep 60
@@ -391,7 +391,7 @@ metadata:
 rendezvousIP: \${IP_ADDRESS}
 hosts:
   - hostname: \${CLUSTER_NAME}
-    rootDeviceHints: 
+    rootDeviceHints:
       deviceName: \${INSTALLATION_DISK}
     role: master
     interfaces:

diff --git a/ci-operator/step-registry/upi/powervs/sno/upi-powervs-sno-workflow.yaml b/ci-operator/step-registry/upi/powervs/sno/upi-powervs-sno-workflow.yaml
@@ -11,7 +11,7 @@ workflow:
       BASE_DOMAIN: "ocp-dev-ppc64le.com"
       POWERVS_USER_ID: "rhocpdev"
       POWERVS_INSTANCE_CRN: "crn:v1:bluemix:public:power-iaas:tok04:a/3c24cb272ca44aa1ac9f6e9490ac5ecd:03b647ba-f416-4170-85b7-7774e5c13dfb::"
-      POWERVS_IMAGE: "rhcos-none-tier0"
+      POWERVS_IMAGE: "rhcos-none"
       POWERVS_NETWORK: "private-net"
       POWERVS_MACHINE_NETWORK_CIDR: "192.168.140.0/24"
       CIS_INSTANCE: "pvs-ipi-dns"