Merge branch 'main' into renovate/major-terraform-dependencies

Author: nupurg-ibm

.catalog-onboard-pipeline.yaml

@@ -2,10 +2,10 @@
 apiVersion: v1
 offerings:
 # below is an example of a Deployable Architecture (DA) solution
-- name: deploy-arch-ibm-hpc # must match the offering name in the ibm_catalog.json
+- name: deploy-arch-ibm-hpc-lsf # must match the offering name in the ibm_catalog.json
   kind: solution
-  catalog_id: 8611e025-10b2-488e-8261-a7f584a5114b
-  offering_id: bf3c07f8-5a62-4289-8ea0-94dbb2b410e6
+  catalog_id: 0d89ec0d-d39a-494d-ac5b-9d940d8cc65f
+  offering_id: 1444e20a-af22-40d1-af98-c880918849cb
   # list all of the variations (flavors) you have included in the ibm_catalog.json
   variations:
     - name: Cluster-with-LSF

LSF_DA_New.drawio.svg

@@ -587,7 +587,7 @@
                             ]
                         },
                         {
-                            "service_name": "sysdig-secure",
+                            "service_name": "Security and Compliance Center Workload Protection",
                             "role_crns": [
                                 "crn:v1:bluemix:public:iam::::role:Administrator"
                             ]
@@ -606,7 +606,7 @@
                             ]
                         },
                         {
-                            "service_name": "service",
+                            "service_name": "All Identity and Access enabled services",
                             "role_crns": [
                                 "crn:v1:bluemix:public:iam::::serviceRole:Manager",
                                 "crn:v1:bluemix:public:iam::::role:Administrator"

hpcaas-arch-1.6.svg

@@ -4,7 +4,7 @@ locals {
   deployer_path               = "/opt/ibm"
   remote_terraform_path       = format("%s/terraform-ibm-hpc", local.deployer_path)
   da_hpc_repo_url             = "github.com/terraform-ibm-modules/terraform-ibm-hpc.git"
-  da_hpc_repo_tag             = "lsf-da-20-june" ###### change it to main in future
+  da_hpc_repo_tag             = "main"
   remote_ansible_path         = format("%s/ibm-spectrumscale-cloud-deploy", local.deployer_path)
   scale_cloud_infra_repo_url  = "https://github.com/jayeshh123/ibm-spectrum-scale-install-infra"
   scale_cloud_infra_repo_name = "ibm-spectrum-scale-install-infra"

ibm_catalog.json

@@ -269,7 +269,7 @@
           "value": "__NULL__",
           "type": "string",
           "secure": false,
-          "description": "Provide the existing kms key name that you want to use for the IBM Cloud HPC cluster. Note: kms_key_name to be considered only if key_management value is set as key_protect.(for example kms_key_name: my-encryption-key)."
+          "description": "Provide the existing kms key name that you want to use for the IBM Spectrum LSF cluster. Note: kms_key_name to be considered only if key_management value is set as key_protect.(for example kms_key_name: my-encryption-key)."
         },
         {
           "name": "enable_vpc_flow_logs",

modules/resource_provisioner/locals.tf

@@ -3,5 +3,6 @@
   "cluster_prefix": $PREFIX,
   "zones": "[\"ca-tor-1\"]",
   "existing_resource_group": "geretain-hpc-rg",
-  "ssh_keys": "[\"geretain-hpc-ssh-key\"]"
+  "ssh_keys": "[\"geretain-hpc-ssh-key\"]",
+  "app_center_gui_password": $RAND_PASSWORD
 }

samples/configs/hpc_schematics_values.json

@@ -298,7 +298,7 @@ variable "static_compute_instances" {
   )
   default = [{
     profile = "bx2-4x16"
-    count   = 1
+    count   = 0
     image   = "hpc-lsf-fp15-compute-rhel810-v1"
   }]
   description = "Specify the list of static compute node configurations, including instance profile, image name, and count. By default, all compute nodes are created using Fix Pack 15. If deploying with Fix Pack 14, set lsf_version to fixpack_14 and use the corresponding image hpc-lsf-fp14-compute-rhel810-v1. The selected image must align with the specified lsf_version, any mismatch may lead to deployment failures. The solution allows customization of instance profiles and counts, but mixing custom images and IBM stock images across instances is not supported. If using IBM stock images, only Red Hat-based images are allowed."
@@ -475,7 +475,7 @@ variable "kms_instance_name" {
 variable "kms_key_name" {
   type        = string
   default     = null
-  description = "Provide the existing kms key name that you want to use for the IBM Cloud HPC cluster. Note: kms_key_name to be considered only if key_management value is set as key_protect.(for example kms_key_name: my-encryption-key)."
+  description = "Provide the existing kms key name that you want to use for the IBM Spectrum LSF cluster. Note: kms_key_name to be considered only if key_management value is set as key_protect.(for example kms_key_name: my-encryption-key)."
   validation {
     condition     = anytrue([alltrue([var.kms_key_name != null, var.kms_instance_name != null]), (var.kms_key_name == null), (var.key_management != "key_protect")])
     error_message = "Please make sure you are passing the kms_instance_name if you are passing kms_key_name."

solutions/lsf/catalogValidationValues.json.template

@@ -1071,7 +1071,7 @@ variable "login_instance" {
     profile = "bx2-2x8"
     image   = "hpcaas-lsf10-rhel810-compute-v8"
   }]
-  description = "Number of instances to be launched for login node."
+  description = "Specify the list of login node configurations, including instance profile, image name. By default, login node is created using Fix Pack 15. If deploying with Fix Pack 14, set lsf_version to fixpack_14 and use the corresponding image hpc-lsf-fp14-compute-rhel810-v1. The selected image must align with the specified lsf_version, any mismatch may lead to deployment failures."
 }
 
 ##############################################################################
@@ -1101,7 +1101,7 @@ variable "TF_PARALLELISM" {
 ##############################################################################
 
 variable "sccwp_service_plan" {
-  description = "IBM service pricing plan."
+  description = "Specify the plan type for the Security and Compliance Center (SCC) Workload Protection instance. Valid values are free-trial and graduated-tier only."
   type        = string
   default     = "free-trial"
   validation {
@@ -1116,11 +1116,11 @@ variable "sccwp_service_plan" {
 variable "sccwp_enable" {
   type        = bool
   default     = true
-  description = "Flag to enable SCC instance creation. If true, an instance of SCC (Security and Compliance Center) will be created."
+  description = "Set this flag to true to create an instance of IBM Security and Compliance Center (SCC) Workload Protection. When enabled, it provides tools to discover and prioritize vulnerabilities, monitor for security threats, and enforce configuration, permission, and compliance policies across the full lifecycle of your workloads. To view the data on the dashboard, enable the cspm to create the app configuration and required trusted profile policies.[Learn more](https://cloud.ibm.com/docs/workload-protection?topic=workload-protection-about)."
 }
 
 variable "cspm_enabled" {
-  description = "Enable Cloud Security Posture Management (CSPM) for the Workload Protection instance. This will create a trusted profile associated with the SCC Workload Protection instance that has viewer / reader access to the App Config service and viewer access to the Enterprise service. [Learn more](https://cloud.ibm.com/docs/workload-protection?topic=workload-protection-about)."
+  description = "CSPM (Cloud Security Posture Management) is a set of tools and practices that continuously monitor and secure cloud infrastructure. When enabled, it creates a trusted profile with viewer access to the App Configuration and Enterprise services for the SCC Workload Protection instance. Make sure the required IAM permissions are in place, as missing permissions will cause deployment to fail. If CSPM is disabled, dashboard data will not be available.[Learn more](https://cloud.ibm.com/docs/workload-protection?topic=workload-protection-about)."
   type        = bool
   default     = false
   nullable    = false