Changes related to v2.0.4 (#12)

Co-authored-by: Alex Arvinraj <[email protected]>
IBM-Cloud · Sep 29, 2022 · ee937ed · ee937ed
1 parent a7f418f
commit ee937ed
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # **CHANGELOG**
 
+## **2.0.4**
+### ENHANCEMENTS
+- Support Intel oneAPI for LSF.
+
+### **CHANGES**
+- Updated the default image name having LSF and Intel OneAPI functionality.
+
 ## **2.0.3**
 ### ENHANCEMENTS
 - Support dedicated hosts for static worker nodes.

diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ ibm-gen2host-10-241-0-21  # worker hostname
 * Run the following command to access the storage cluster:
 
 ```buildoutcfg
-#ssh -L 22443:localhost:443 -J root@{STORAGE_NODE_IP_ADDRESS} root@{FLOATING_IP_ADDRESS}
+#ssh -L 22443:localhost:443 -J root@{FLOATING_IP_ADDRESS} root@{STORAGE_NODE_IP_ADDRESS}
 ```
 * where STORAGE_NODE_IP_ADDRESS needs to be replaced with the storage IP address associated with hpc-pc-scale-storage-0, which you gathered earlier, and FLOATING_IP_ADDRESS needs to be replaced with the floating IP address that you identified.
 
@@ -144,7 +144,7 @@ Accessing the compute cluster
 * Run the following command to access the compute cluster:
 
 ```buildoutcfg
- #ssh -L 21443:localhost:443 -J root@{COMPUTE_NODE_IP_ADDRESS} root@{FLOATING_IP_ADDRESS}
+ #ssh -L 21443:localhost:443 -J root@{FLOATING_IP_ADDRESS} root@{COMPUTE_NODE_IP_ADDRESS}
  ```
 * where COMPUTE_NODE_IP_ADDRESS needs to be replaced with the storage IP address associated with hpc-pc-primary-0, which you gathered earlier, and FLOATING_IP_ADDRESS needs to be replaced with the floating IP address that you identified.
 

diff --git a/image-map.tf b/image-map.tf
@@ -1,5 +1,17 @@
 locals {
         image_region_map = {
+          "hpcc-lsf10-scale5131-rhel84-092122-v2" = {
+            "us-south" = "r006-a9171617-6e03-4c7f-ba77-ddc7cb5f980d"
+            "us-east" = "r014-4e55b970-5ce2-44ab-b9ff-49b82e7498d5"
+            "au-syd" = "r026-b62ba927-57b1-4f55-8c9d-47700de6653c"
+            "jp-osa" = "r034-abacd0e2-4a03-4c58-a2f2-417acc4bd739"
+            "jp-tok" = "r022-27bf7b3f-b23b-44d3-bf98-ebcc8b04ca9a"
+            "eu-de" = "r010-2ffa7ece-191f-4cae-9758-4ad3e61d3506"
+            "eu-gb" = "r018-55e711aa-26d0-428e-8ffe-5c2709ecbe07"
+            "ca-tor" = "r038-5412aa01-d227-4395-8b18-7c2bac842960"
+            "br-sao" = "r042-d896bad2-c462-4ca4-94d7-a7a4dba6a5d3"
+          } 
+
           "hpcc-lsf10-cent77-jul2221-v6" = {
             "us-south" = "r006-68478a2e-4abc-4bfb-9e4f-a6fb3b9b235f"
             "us-east" = "r014-4ccae2ea-b286-451b-9667-7e36d759aa5b"

diff --git a/sample/configs/hpc_workspace_config.json b/sample/configs/hpc_workspace_config.json
@@ -95,7 +95,7 @@
         },
         {
           "name": "image_name",
-          "value": "hpcc-lsf10-scale5131-rhel84-060822-v1",
+          "value": "hpcc-lsf10-scale5131-rhel84-092122-v2",
           "type": "string",
           "secure": false,
           "description": "Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Spectrum LSF cluster. By default, the automation uses a base image with e with additional software packages documented [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf). If you would like to include your application-specific binary files, follow the instructions in [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Spectrum LSF cluster through this offering."

diff --git a/scripts/LSF_spectrum_storage.sh b/scripts/LSF_spectrum_storage.sh
@@ -33,6 +33,9 @@ python3 -c "import ipaddress; print('\n'.join([str(ip) + ' ${vmPrefix}-' + str(i
 mkdir -p /mnt/$nfs_mount_dir
 echo "${nfs_server}:/$nfs_mount_dir /mnt/$nfs_mount_dir nfs rw,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,_netdev 0 0" >> /etc/fstab
 mount /mnt/$nfs_mount_dir
+# Workaround: Adding sleep till we get nfs data synced
+retry=0
+while [ ! -f /mnt/$nfs_mount_dir/ssh/id_rsa ]; do sleep 5; let retry++; echo Retry count: $retry. Waiting for nfs data to mount; if [[ ! -f /mnt/$nfs_mount_dir/ssh/id_rsa && $retry -gt 60 ]]; then echo Received mount status as failure; exit 1; fi; done
 ln -s /mnt/$nfs_mount_dir /root/shared
 
 # Change the MTU setting as this is required for setting mtu as 9000 for communication to happen between clusters

diff --git a/variables.tf b/variables.tf
@@ -80,7 +80,7 @@ variable "zone" {
 
 variable "image_name" {
   type        = string
-  default     = "hpcc-lsf10-scale5131-rhel84-060822-v1"
+  default     = "hpcc-lsf10-scale5131-rhel84-092122-v2"
   description = "Name of the custom image that you want to use to create virtual server instances in your IBM Cloud account to deploy the IBM Spectrum LSF cluster. By default, the automation uses a base image with e with additional software packages documented [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf). If you would like to include your application-specific binary files, follow the instructions in [Planning for custom images](https://cloud.ibm.com/docs/vpc?topic=vpc-planning-custom-images) to create your own custom image and use that to build the IBM Spectrum LSF cluster through this offering."
 }