terraform-ibm-modules · nupurg-ibm · Aug 28, 2024 · Aug 28, 2024 · Aug 28, 2024
@@ -33,5 +33,6 @@ go version
 python3 -m pip install --upgrade pip
 python3 -m pip install --pre --upgrade requests==2.20.0
 python3 -m pip install --pre --upgrade ibm-cos-sdk==2.0.1
+ibmcloud plugin install key-protect -f
 
 echo "************************************************"
@@ -79,7 +79,7 @@ pr_ubuntu_suite() {
 # commit based suite on rhel-suite-1
 rhel_suite_1() {
     suite=rhel-suite-1
-    test_cases="TestRunBasic,TestRunAppCenter,TestRunNoKMSAndHTOff"
+    test_cases="TestRunBasic,TestRunAppCenter,TestRunNoKMSAndHTOff,TestRunCosAndVpcFlowLogs"
     new_line="${test_cases//,/$'\n'}"
     echo "************** Going to run ${suite} ${new_line} **************"
     common_suite "${test_cases}" "${suite}" "${compute_image_name_rhel:?}"
@@ -88,7 +88,7 @@ rhel_suite_1() {
 # commit based suite on rhel-suite-2
 rhel_suite_2() {
     suite=rhel-suite-2
-    test_cases="TestRunLDAP,TestRunLDAPAndPac,TestRunCustomRGAsNonDefault"
+    test_cases="TestRunLDAP,TestRunLDAPAndPac,TestRunCustomRGAsNonDefault,TestRunUsingExistingKMSInstanceIDAndWithoutKey"
     new_line="${test_cases//,/$'\n'}"
     echo "************** Going to run ${suite} ${new_line} **************"
     common_suite "${test_cases}" "${suite}" "${compute_image_name_rhel:?}"
@@ -124,7 +124,7 @@ ubuntu_suite_2() {
 # commit based suite on ubuntu-suite-3
 ubuntu_suite_3() {
     suite=ubuntu-suite-3
-    test_cases="TestRunBasic,TestRunNoKMSAndHTOff"
+    test_cases="TestRunBasic,TestRunNoKMSAndHTOff,TestRunExistingLDAP,TestRunExistingPACEnvironment"
     new_line="${test_cases//,/$'\n'}"
     echo "************** Going to run ${suite} ${new_line} **************"
     common_suite "${test_cases}" "${suite}" "${compute_image_name_ubuntu:?}"
@@ -142,7 +142,7 @@ regions_suite() {
 # negative based suite on negative-suite
 negative_suite() {
     suite=negative-suite
-    test_cases="TestRunWithoutMandatory,TestRunInvalidReservationIDAndContractID,TestRunInvalidLDAPServerIP,TestRunInvalidLDAPUsernamePassword,TestRunInvalidAPPCenterPassword,TestRunInvalidDomainName,TestRunKMSInstanceNameAndKMSKeyNameWithInvalidValue,TestRunExistSubnetIDVpcNameAsNull"
+    test_cases="TestRunWithoutMandatory,TestRunInvalidReservationIDAndContractID,TestRunInvalidLDAPServerIP,TestRunInvalidLDAPUsernamePassword,TestRunInvalidAPPCenterPassword,TestRunInvalidDomainName,TestRunKMSInstanceNameAndKMSKeyNameWithInvalidValue,TestRunExistSubnetIDVpcNameAsNull,TestRunInvalidSshKeysAndRemoteAllowedIP,TestRunInvalidSubnetCIDR"
     new_line="${test_cases//,/$'\n'}"
     echo "************** Going to run ${suite} ${new_line} **************"
     common_suite "${test_cases}" "${suite}" "${compute_image_name_rhel:?}"

@@ -233,13 +233,13 @@ cat /opt/ibm/lsf/conf/hosts >> /etc/hosts
 if [ "$enable_ldap" = "true" ]; then
 
     # Detect the operating system
-    if grep -q "NAME=\"Red Hat Enterprise Linux\"" /etc/os-release; then
+    if grep -q "NAME=\"Red Hat Enterprise Linux\"" /etc/os-release || grep -q "NAME=\"Rocky Linux\"" /etc/os-release; then
 
-        # Detect RHEL version
-        rhel_version=$(grep -oE 'release [0-9]+' /etc/redhat-release | awk '{print $2}')
+        # Detect RHEL or Rocky version
+        version=$(grep -oE 'release [0-9]+' /etc/redhat-release | awk '{print $2}')
 
-        if [ "$rhel_version" == "8" ]; then
-            echo "Detected RHEL 8. Proceeding with LDAP client configuration...." >> $logfile
+        if [ "$version" == "8" ]; then
+            echo "Detected as RHEL or Rocky 8. Proceeding with LDAP client configuration...." >> $logfile
 
             # Allow Password authentication
             sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/' /etc/ssh/sshd_config
@@ -294,7 +294,7 @@ EOF
             echo ". ${LSF_CONF}/profile.lsf" >> /etc/bashrc
             source /etc/bashrc
         else
-            echo "This script is designed for RHEL 8. Detected RHEL version: $rhel_version. Exiting." >> $logfile
+            echo "This script is intended for RHEL 8 or Rocky Linux 8. Detected version: $version. Exiting." >> $logfile
             exit 1
         fi
 

@@ -49,6 +49,7 @@ LSF_TOP_VERSION="$LSF_TOP/10.1"
 LSF_SUITE_TOP="/opt/ibm/lsfsuite"
 LSF_SUITE_GUI="${LSF_SUITE_TOP}/ext/gui"
 LSF_SUITE_GUI_CONF="${LSF_SUITE_GUI}/conf"
+LSF_SUITE_GUI_WORK="${LSF_SUITE_GUI}/work"
 LSF_SUITE_PERF="${LSF_SUITE_TOP}/ext/perf"
 LSF_SUITE_PERF_CONF="${LSF_SUITE_PERF}/conf"
 LSF_SUITE_PERF_BIN="${LSF_SUITE_PERF}/1.2/bin"
@@ -265,7 +266,10 @@ EOT
     "ca-tor": "https://ca-tor.iaas.cloud.ibm.com/v1",
     "jp-osa": "https://jp-osa.iaas.cloud.ibm.com/v1",
     "jp-tok": "https://jp-tok.iaas.cloud.ibm.com/v1",
-    "br-sao": "https://br-sao.iaas.cloud.ibm.com/v1"
+    "br-sao": "https://br-sao.iaas.cloud.ibm.com/v1",
+    "us-south": "https://us-south.iaas.cloud.ibm.com/v1",
+    "eu-de": "https://eu-de.iaas.cloud.ibm.com/v1",
+    "us-east": "https://us-east.iaas.cloud.ibm.com/v1"
   }
 }
 EOT
@@ -674,6 +678,7 @@ mount_nfs_with_retries() {
 if [ -n "${nfs_server_with_mount_path}" ]; then
   echo "File share ${nfs_server_with_mount_path} found"
   nfs_client_mount_path="/mnt/lsf"
+  nfs_client_mount_pac_path="${nfs_client_mount_path}/pac"
   if mount_nfs_with_retries "${nfs_server_with_mount_path}" "${nfs_client_mount_path}"; then
     # Move stuff to shared fs
     for dir in conf work das_staging_area; do
@@ -688,15 +693,22 @@ if [ -n "${nfs_server_with_mount_path}" ]; then
     done
 
     # Sharing the lsfsuite.conf folder
-    if [ "$on_primary" == "true" ]; then
-      rm -rf "${nfs_client_mount_path}/gui-conf"
-      mv "${LSF_SUITE_GUI_CONF}" "${nfs_client_mount_path}/gui-conf"
-      chown -R lsfadmin:root "${nfs_client_mount_path}/gui-conf"
-    else
-      rm -rf "${LSF_SUITE_GUI_CONF}"
+    if [ "$on_primary" == "true" ] && [ "$enable_app_center" == "true" ] && [ "$app_center_high_availability" == "true" ]; then
+        # Create pac folder if it does not exist
+        [ ! -d "${nfs_client_mount_pac_path}" ] && mkdir -p "${nfs_client_mount_pac_path}"
+
+        # Remove the original folder and create symlink for gui-conf
+        [ -d "${nfs_client_mount_pac_path}/gui-conf" ] && rm -rf "${nfs_client_mount_pac_path}/gui-conf"
+        mv "${LSF_SUITE_GUI_CONF}" "${nfs_client_mount_pac_path}/gui-conf"
+        chown -R lsfadmin:root "${nfs_client_mount_pac_path}/gui-conf" && chown -R lsfadmin:lsfadmin "${LSF_SUITE_GUI_CONF}"
+        ln -fs "${nfs_client_mount_pac_path}/gui-conf" "${LSF_SUITE_GUI_CONF}"
+
+        # Remove the original folder and create symlink for gui-work
+        [ -d "${nfs_client_mount_pac_path}/gui-work" ] && rm -rf "${nfs_client_mount_pac_path}/gui-work"
+        mv "${LSF_SUITE_GUI_WORK}" "${nfs_client_mount_pac_path}/gui-work"
+        chown -R lsfadmin:root "${nfs_client_mount_pac_path}/gui-work" && chown -R lsfadmin:lsfadmin "${LSF_SUITE_GUI_WORK}"
+        ln -fs "${nfs_client_mount_pac_path}/gui-work" "${LSF_SUITE_GUI_WORK}"
     fi
-    ln -fs "${nfs_client_mount_path}/gui-conf" "${LSF_SUITE_GUI_CONF}"
-    chown -R lsfadmin:root "${LSF_SUITE_GUI_CONF}"
 
     # Create a data directory for sharing HPC workload data
     if [ "$on_primary" == "true" ]; then
@@ -705,14 +717,6 @@ if [ -n "${nfs_server_with_mount_path}" ]; then
       chown -R lsfadmin:root "$LSF_TOP/work/data"
     fi
 
-    # Sharing the 10.1 folder
-    if [ "$on_primary" == "true" ]; then
-      rm -rf "${nfs_client_mount_path}/10.1"
-      mv "${LSF_TOP_VERSION}" "${nfs_client_mount_path}"
-      ln -s "${nfs_client_mount_path}/10.1" "${LSF_TOP_VERSION}"
-      chown -R lsfadmin:root "${LSF_TOP_VERSION}"
-    fi
-
     # VNC Sessions
     if [ "$on_primary" == "true" ]; then
       mkdir -p "${nfs_client_mount_path}/repository-path"

@@ -1,19 +1,19 @@
 locals {
   image_region_map = {
-    "hpcaas-lsf10-rhel88-v9" = {
-      "us-east"  = "r014-d2b18006-c0c4-428f-96f3-e033b970c582"
-      "eu-de"    = "r010-3bf3f57e-1985-431d-aefe-e9914ab7919c"
-      "us-south" = "r006-7b0aa90b-f52c-44b1-bab7-ccbfae9f1816"
+    "hpcaas-lsf10-rhel88-v10" = {
+      "us-east"  = "r014-c425251e-b7b5-479f-b9cf-ef72a0f51b5a"
+      "eu-de"    = "r010-ce6dac2b-57e4-4a2f-a77d-8b0e549b2cae"
+      "us-south" = "r006-c8fefef3-645d-4b5a-bad0-2250c6ddb627"
     },
-    "hpcaas-lsf10-rhel88-compute-v5" = {
-      "us-east"  = "r014-deb34fb1-edbf-464c-9af3-7efa2efcff3f"
-      "eu-de"    = "r010-2d04cfff-6f54-45d1-b3b3-7e259083d71f"
-      "us-south" = "r006-236ee1f4-38de-4845-b7ec-e2ffa7df5d08"
+    "hpcaas-lsf10-rhel88-compute-v6" = {
+      "us-east"  = "r014-f4c0dd0f-3bd0-4e2f-bbda-bbbc75a8c33b"
+      "eu-de"    = "r010-0217f13b-e6e5-4500-acd4-c170f111d43f"
+      "us-south" = "r006-15514933-925c-4923-85dd-3165dcaa3180"
     },
-    "hpcaas-lsf10-ubuntu2204-compute-v5" = {
-      "us-east"  = "r014-ecbf4c89-16a3-472e-8bab-1e76d744e264"
-      "eu-de"    = "r010-9811d8bf-a7f8-4ee6-8342-e5af217bc513"
-      "us-south" = "r006-ed76cb75-f086-48e9-8090-e2dbc411abe7"
+    "hpcaas-lsf10-ubuntu2204-compute-v6" = {
+      "us-east"  = "r014-ab2e8be8-d75c-4040-a337-7f086f3ce153"
+      "eu-de"    = "r010-027f5d54-9360-4d1f-821b-583329d63855"
+      "us-south" = "r006-628b6dbe-e0d4-4c25-bc0f-f554f5523f2e"
     }
   }
 }
@@ -20,9 +20,9 @@
     "enable_cos_integration"    : "false",
     "cos_instance_name"         : "__NULL__",
     "enable_fip"                : "true",
-    "management_image_name"     : "hpcaas-lsf10-rhel88-v9",
-    "compute_image_name"        : "hpcaas-lsf10-rhel88-compute-v5",
-    "login_image_name"          : "hpcaas-lsf10-rhel88-compute-v5",
+    "management_image_name"     : "hpcaas-lsf10-rhel88-v10",
+    "compute_image_name"        : "hpcaas-lsf10-rhel88-compute-v6",
+    "login_image_name"          : "hpcaas-lsf10-rhel88-compute-v6",
     "login_node_instance_type"  : "bx2-2x8",
     "management_node_instance_type" : "bx2-16x64",
     "management_node_count"     : "3",

@@ -197,25 +197,25 @@
         },
         {
           "name": "management_image_name",
-          "value": "hpcaas-lsf10-rhel88-v9",
+          "value": "hpcaas-lsf10-rhel88-v10",
           "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 Cloud HPC cluster management nodes. By default, the solution uses a RHEL88 base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). 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 Cloud HPC cluster through this offering."
         },
         {
           "name": "compute_image_name",
-          "value": "hpcaas-lsf10-rhel88-compute-v5",
+          "value": "hpcaas-lsf10-rhel88-compute-v6",
           "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 Cloud HPC cluster dynamic compute nodes. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v5). 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 Cloud HPC cluster through this offering."
+          "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 Cloud HPC cluster dynamic compute nodes. By default, the solution uses a RHEL 8-8 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v6). 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 Cloud HPC cluster through this offering."
 
         },
         {
           "name": "login_image_name",
           "value": "hpcaas-lsf10-rhel88-compute-v5",
           "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 Cloud HPC cluster login node. By default, the solution uses a RHEL 8-6 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v5). 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 Cloud HPC cluster through this offering."
+          "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 Cloud HPC cluster login node. By default, the solution uses a RHEL 8-8 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v6). 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 Cloud HPC cluster through this offering."
         },
         {
           "name": "login_node_instance_type",
@@ -324,7 +324,7 @@
           "value": "true",
           "type": "bool",
           "secure": false,
-          "description": "Enable Activity tracker service instance connected to Cloud Object Storage (COS). All the events will be stored into COS so that customers can connect to it and read those events or ingest them in their system."
+          "description": "Enable Activity tracker service instance connected to Cloud Object Storage (COS). All the events will be stored in COS so customers can retrieve or ingest them in their system. While multiple Activity Tracker instances can be created, only one tracker is needed to capture all events. Creating additional trackers is unnecessary if an existing Activity Tracker is already integrated with a COS bucket. In such cases, set the value to false, as all events can be monitored and accessed through the existing Activity Tracker."
         },
         {
           "name": "enable_ldap",

@@ -176,21 +176,21 @@ variable "login_node_instance_type" {
 }
 variable "management_image_name" {
   type        = string
-  default     = "hpcaas-lsf10-rhel88-v9"
+  default     = "hpcaas-lsf10-rhel88-v10"
   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 Cloud HPC cluster management nodes. By default, the solution uses a RHEL88 base image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). 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 Cloud HPC cluster through this offering."
 
 }
 
 variable "compute_image_name" {
   type        = string
-  default     = "hpcaas-lsf10-rhel88-compute-v5"
-  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 Cloud HPC cluster dynamic compute nodes. By default, the solution uses a RHEL 8-8 base OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v5). 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 Cloud HPC cluster through this offering."
+  default     = "hpcaas-lsf10-rhel88-compute-v6"
+  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 Cloud HPC cluster dynamic compute nodes. By default, the solution uses a RHEL 8-8 base OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v6). 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 Cloud HPC cluster through this offering."
 }
 
 variable "login_image_name" {
   type        = string
-  default     = "hpcaas-lsf10-rhel88-compute-v5"
-  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 Cloud HPC cluster login node. By default, the solution uses a RHEL 8-8 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v5). 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 Cloud HPC cluster through this offering."
+  default     = "hpcaas-lsf10-rhel88-compute-v6"
+  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 Cloud HPC cluster login node. By default, the solution uses a RHEL 8-8 OS image with additional software packages mentioned [here](https://cloud.ibm.com/docs/ibm-spectrum-lsf#create-custom-image). The solution also offers, Ubuntu 22-04 OS base image (hpcaas-lsf10-ubuntu2204-compute-v6). 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 Cloud HPC cluster through this offering."
 }
 
 variable "management_node_instance_type" {
@@ -296,7 +296,7 @@ variable "cos_instance_name" {
 variable "observability_atracker_on_cos_enable" {
   type        = bool
   default     = true
-  description = "Enable Activity tracker service instance connected to Cloud Object Storage (COS). All the events will be stored into COS so that customers can connect to it and read those events or ingest them in their system."
+  description = "Enable Activity tracker service instance connected to Cloud Object Storage (COS). All the events will be stored in COS so customers can retrieve or ingest them in their system. While multiple Activity Tracker instances can be created, only one tracker is needed to capture all events. Creating additional trackers is unnecessary if an existing Activity Tracker is already integrated with a COS bucket. In such cases, set the value to false, as all events can be monitored and accessed through the existing Activity Tracker."
 }
 
 variable "enable_vpc_flow_logs" {