Pushing scale DA solution

.catalog-onboard-pipeline.yaml

@@ -22,3 +22,23 @@ offerings:
         region: us-south
       # pre_validation: tests/scripts/pre-validation.sh # optionally run a command before validation runs
       # post_validation: tests/scripts/post-validation.sh  # optionally run a command after validation completes
+- name: deploy-arch-ibm-storage-scale # must match the offering name in the ibm_catalog.json
+  kind: solution
+  catalog_id: 90717ada-be34-4b82-a0d9-0f225f8dbd76
+  offering_id: 33105573-84df-4279-9efa-48887456fa6d
+  # list all of the variations (flavors) you have included in the ibm_catalog.json
+  variations:
+    - name: Cluster-with-Scale
+      mark_ready: false # have pipeline mark as visible if validation passes
+      install_type: fullstack # ensure value matches what is in ibm_catalog.json (fullstack or extension)
+      destroy_resources_on_failure: false # defaults to false if not specified so resources can be inspected to debug failures during validation
+      destroy_workspace_on_failure: false # defaults to false if not specified so schematics workspace can be inspected to debug failures during validation
+      import_only: false  # defaults to false - set to true if you do not want to do any validation, but be aware offering can't be publish if not validated
+      validation_rg: validation # the resource group in which to do validation in. Will be created if does not exist. If not specified, default value is 'validation'
+      # scc details needed if your offering is claiming any compliance controls
+      scc:
+        # must be an instance in the same account the validation is being done in
+        instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
+        region: us-south
+      # pre_validation: tests/scripts/pre-validation.sh # optionally run a command before validation runs
+      # post_validation: tests/scripts/post-validation.sh  # optionally run a command after validation completes

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2025-06-19T07:38:57Z",
+  "generated_at": "2025-08-19T13:31:49Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -102,6 +102,32 @@
         "type": "Secret Keyword",
         "verified_result": null
       }
+    ],
+    "samples/configs/scale_catalog_values.json": [
+      {
+        "hashed_secret": "2e7ec5f9611439242fd8e30e3e13bc36baff526c",
+        "is_secret": true,
+        "is_verified": false,
+        "line_number": 10,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "1f5e25be9b575e9f5d39c82dfd1d9f4d73f1975c",
+        "is_secret": true,
+        "is_verified": false,
+        "line_number": 45,
+        "type": "Secret Keyword",
+        "verified_result": null
+      },
+      {
+        "hashed_secret": "b295b04949a98dc50ba65adcddd588077b93ab3c",
+        "is_secret": true,
+        "is_verified": false,
+        "line_number": 62,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
     ]
   },
   "version": "0.13.1+ibm.62.dss",

cra-config.yaml

@@ -8,3 +8,12 @@ CRA_TARGETS:
       TF_VAR_ssh_keys: "[\"geretain-hpc\"]"
       TF_VAR_remote_allowed_ips: "[\"49.207.216.50\"]"
       TF_VAR_app_center_gui_password: "Craconfig@123" #pragma: allowlist secret
+  - CRA_TARGET: "solutions/scale"
+    CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
+    PROFILE_ID: "48279384-3d29-4089-8259-8ed354774b4a"  # SCC profile ID (currently set to 'CIS IBM Cloud Foundations Benchmark v1.1.0' '1.1.0' profile).
+    CRA_ENVIRONMENT_VARIABLES:
+      TF_VAR_ssh_keys: "[\"geretain-hpc\"]"
+      TF_VAR_remote_allowed_ips: "[\"49.207.216.50\"]"
+      TF_VAR_storage_gui_username: "storagegui"
+      TF_VAR_storage_type: "evaluation"
+      TF_VAR_storage_gui_password: "Stor@ge1234" #pragma: allowlist secret

datasource.tf

@@ -33,24 +33,25 @@ data "ibm_is_subnet" "subnet" {
 #   name  = var.existing_resource_group
 # }
 
-data "ibm_is_subnet" "existing_cluster_subnets" {
-  count      = var.vpc_name != null && var.cluster_subnet_id != null ? 1 : 0
-  identifier = var.cluster_subnet_id
+data "ibm_is_subnet" "existing_compute_subnets" {
+  count      = var.vpc_name != null && var.compute_subnet_id != null ? 1 : 0
+  identifier = var.compute_subnet_id
 }
 
+
 data "ibm_is_subnet" "existing_storage_subnets" {
-  count = var.vpc_name != null && var.storage_subnets != null ? 1 : 0
-  name  = var.storage_subnets[count.index]
+  count      = var.vpc_name != null && var.storage_subnet_id != null ? 1 : 0
+  identifier = var.storage_subnet_id
 }
 
 data "ibm_is_subnet" "existing_protocol_subnets" {
-  count = var.vpc_name != null && var.protocol_subnets != null ? 1 : 0
-  name  = var.protocol_subnets[count.index]
+  count      = var.vpc_name != null && var.protocol_subnet_id != null ? 1 : 0
+  identifier = var.protocol_subnet_id
 }
 
 data "ibm_is_subnet" "existing_client_subnets" {
-  count = var.vpc_name != null && var.client_subnets != null ? 1 : 0
-  name  = var.client_subnets[count.index]
+  count      = var.vpc_name != null && var.client_subnet_id != null ? 1 : 0
+  identifier = var.client_subnet_id
 }
 
 data "ibm_is_subnet" "existing_login_subnets" {
@@ -64,8 +65,8 @@ data "ibm_is_ssh_key" "ssh_keys" {
 }
 
 data "ibm_is_subnet" "compute_subnet_crn" {
-  count      = var.vpc_name != null && var.cluster_subnet_id != null ? 1 : 0
-  identifier = local.compute_subnet_id
+  count      = var.vpc_name != null && var.compute_subnet_id != null ? 1 : 0
+  identifier = local.compute_subnet
 }
 
 data "ibm_is_instance_profile" "compute_profile" {
@@ -77,7 +78,7 @@ data "ibm_is_instance_profile" "storage_profile" {
 }
 
 data "ibm_is_bare_metal_server_profile" "storage_bms_profile" {
-  count = var.scheduler == "Scale" ? 1 : 0
+  count = var.scheduler == "Scale" && var.storage_type == "persistent" ? 1 : 0
   name  = local.storage_bms_profile[0]
 }
 
@@ -90,12 +91,27 @@ data "ibm_is_instance_profile" "protocol_profile" {
   name  = local.protocol_vsi_profile[0]
 }
 
+data "ibm_is_bare_metal_server_profile" "protocol_bm_profile" {
+  count = local.ces_server_type == true && (local.scale_ces_enabled == true && var.colocate_protocol_instances == false) ? 1 : 0
+  name  = local.protocol_vsi_profile[0]
+}
+
 data "ibm_is_subnet_reserved_ips" "protocol_subnet_reserved_ips" {
-  count  = local.scale_ces_enabled == true ? 1 : 0
-  subnet = local.protocol_subnet_id
+  count  = var.enable_deployer == false && local.scale_ces_enabled == true ? 1 : 0
+  subnet = local.protocol_subnet
 }
 
 data "ibm_is_instance_profile" "afm_server_profile" {
   count = local.afm_server_type == false ? 1 : 0
   name  = local.afm_vsi_profile[0]
 }
+
+data "ibm_is_bare_metal_server_profile" "afm_bm_profile" {
+  count = local.afm_server_type == true ? 1 : 0
+  name  = local.afm_vsi_profile[0]
+}
+
+data "ibm_is_security_group" "login_security_group" {
+  count = var.login_security_group_name != null ? 1 : 0
+  name  = var.login_security_group_name
+}