From 8df93b359e2e43a71a390b1acca06a33abc761c3 Mon Sep 17 00:00:00 2001 From: Haresh-Kumar-K-J Date: Thu, 6 Nov 2025 00:19:23 -0800 Subject: [PATCH 1/2] Skip the protocol installation for ARM in AWS Signed-off-by: Haresh-Kumar-K-J --- .../sub_modules/instance_template/README.md | 2 +- .../sub_modules/vpc_template/README.md | 2 +- .../ibmcloud_new_vpc_scale/README.md | 2 +- .../sub_modules/instance_template/README.md | 2 +- packer_templates/aws/install.sh | 34 ++++++++++++------- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/gcp_scale_templates/sub_modules/instance_template/README.md b/gcp_scale_templates/sub_modules/instance_template/README.md index 9c4e5c31..9b672edb 100644 --- a/gcp_scale_templates/sub_modules/instance_template/README.md +++ b/gcp_scale_templates/sub_modules/instance_template/README.md @@ -168,7 +168,7 @@ The following steps will provision GCP resources (compute and storage instances | Name | Version | |------|---------| | [terraform](#requirement_terraform) | ~> 1.0 | -| [google](#requirement_google) | ~> 6.0 | +| [google](#requirement_google) | ~> 7.0 | #### Inputs diff --git a/gcp_scale_templates/sub_modules/vpc_template/README.md b/gcp_scale_templates/sub_modules/vpc_template/README.md index fcf5659a..e185fc91 100644 --- a/gcp_scale_templates/sub_modules/vpc_template/README.md +++ b/gcp_scale_templates/sub_modules/vpc_template/README.md @@ -110,7 +110,7 @@ The below steps will provision the GCP VPC required for the IBM Spectrum Scale c | Name | Version | |------|---------| | [terraform](#requirement_terraform) | ~> 1.0 | -| [google](#requirement_google) | ~> 6.0 | +| [google](#requirement_google) | ~> 7.0 | #### Inputs diff --git a/ibmcloud_scale_templates/ibmcloud_new_vpc_scale/README.md b/ibmcloud_scale_templates/ibmcloud_new_vpc_scale/README.md index c822011c..4f670de2 100644 --- a/ibmcloud_scale_templates/ibmcloud_new_vpc_scale/README.md +++ b/ibmcloud_scale_templates/ibmcloud_new_vpc_scale/README.md @@ -44,7 +44,7 @@ The following steps will provision IBM Cloud resources (new vpc, bastion, comput | Name | Version | |------|---------| -| [ibm](#requirement_ibm) | 1.79.2 | +| [ibm](#requirement_ibm) | 1.84.3 | #### Inputs diff --git a/ibmcloud_scale_templates/sub_modules/instance_template/README.md b/ibmcloud_scale_templates/sub_modules/instance_template/README.md index 1d0bce86..ddb405dc 100644 --- a/ibmcloud_scale_templates/sub_modules/instance_template/README.md +++ b/ibmcloud_scale_templates/sub_modules/instance_template/README.md @@ -53,7 +53,7 @@ Below steps will provision IBM Cloud resources (compute and storage instances in | Name | Version | |------|---------| -| [ibm](#requirement_ibm) | 1.79.2 | +| [ibm](#requirement_ibm) | 1.84.3 | #### Inputs diff --git a/packer_templates/aws/install.sh b/packer_templates/aws/install.sh index 781b6bd0..8321a76d 100755 --- a/packer_templates/aws/install.sh +++ b/packer_templates/aws/install.sh @@ -73,7 +73,11 @@ elif [ -f /etc/os-release ] && grep -qiE 'redhat' /etc/os-release; then sudo sh -c "echo 'gpgcheck=1' >> /etc/yum.repos.d/scale.repo" sudo sh -c "echo 'gpgkey=http://$PACKAGE_REPOSITORY.s3-website.$VPC_REGION.amazonaws.com/$SCALE_VERSION/Public_Keys/Storage_Scale_public_key.pgp' >> /etc/yum.repos.d/scale.repo" sudo sh -c "echo -e '\n' >> /etc/yum.repos.d/scale.repo" - sudo dnf install -y gpfs.base gpfs.docs gpfs.msg.en* gpfs.compression gpfs.ext gpfs.gpl gpfs.gskit gpfs.gui gpfs.java gpfs.gss.pmcollector gpfs.gss.pmsensors gpfs.afm.cos gpfs.compression gpfs.license* gpfs.librdkafka* gpfs.scaleapi* + if [[ "$arch" == arm* || "$arch" == aarch64 ]]; then + sudo dnf install -y gpfs.base gpfs.docs gpfs.msg.en* gpfs.compression gpfs.ext gpfs.gpl gpfs.gskit gpfs.gui gpfs.java gpfs.gss.pmcollector gpfs.gss.pmsensors gpfs.compression gpfs.license* gpfs.librdkafka* gpfs.scaleapi* + else + sudo dnf install -y gpfs.base gpfs.docs gpfs.msg.en* gpfs.compression gpfs.ext gpfs.gpl gpfs.gskit gpfs.gui gpfs.java gpfs.gss.pmcollector gpfs.gss.pmsensors gpfs.afm.cos gpfs.compression gpfs.license* gpfs.librdkafka* gpfs.scaleapi* + fi if sudo dnf search gpfs.adv | grep -q "gpfs.adv"; then sudo dnf install -y gpfs.adv fi @@ -167,6 +171,10 @@ install_hdfs() { fi } +if [[ "$arch" == arm* || "$arch" == aarch64 ]]; then + INSTALL_PROTOCOLS="None" +fi + case "$INSTALL_PROTOCOLS" in None) echo "skipping protocol rpm/debs installation" @@ -203,26 +211,26 @@ case "$INSTALL_PROTOCOLS" in install_s3 ;; nfs-hdfs) - ces_failover - install_nfs - install_hdfs - ;; + ces_failover + install_nfs + install_hdfs + ;; smb-hdfs) - ces_failover - install_smb - install_hdfs - ;; + ces_failover + install_smb + install_hdfs + ;; s3-hdfs) - ces_failover + ces_failover install_s3 - install_hdfs - ;; + install_hdfs + ;; *) ces_failover install_nfs install_smb install_s3 - install_hdfs + install_hdfs ;; esac From bc681be03235e932185c03eace1a2133809c57d2 Mon Sep 17 00:00:00 2001 From: Haresh-Kumar-K-J Date: Thu, 6 Nov 2025 02:55:44 -0800 Subject: [PATCH 2/2] Removed gpfs.afm.cos package installation for arm Signed-off-by: Haresh-Kumar-K-J --- packer_templates/aws/install.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packer_templates/aws/install.sh b/packer_templates/aws/install.sh index 8321a76d..503556c7 100755 --- a/packer_templates/aws/install.sh +++ b/packer_templates/aws/install.sh @@ -171,10 +171,6 @@ install_hdfs() { fi } -if [[ "$arch" == arm* || "$arch" == aarch64 ]]; then - INSTALL_PROTOCOLS="None" -fi - case "$INSTALL_PROTOCOLS" in None) echo "skipping protocol rpm/debs installation"