From cae4d09663af8c268b68a58dbbf4774fae663e52 Mon Sep 17 00:00:00 2001 From: Sagar BK Date: Thu, 3 Jul 2025 22:29:49 +0530 Subject: [PATCH] scale-review-changes --- .catalog-onboard-pipeline.yaml | 24 +- ibm_catalog.json | 495 ++++++++++++++++++++++++++++++++- 2 files changed, 515 insertions(+), 4 deletions(-) diff --git a/.catalog-onboard-pipeline.yaml b/.catalog-onboard-pipeline.yaml index 4c9003c4..ae9ee3e2 100644 --- a/.catalog-onboard-pipeline.yaml +++ b/.catalog-onboard-pipeline.yaml @@ -4,8 +4,8 @@ offerings: # below is an example of a Deployable Architecture (DA) solution - name: deploy-arch-ibm-hpc-lsf # must match the offering name in the ibm_catalog.json kind: solution - catalog_id: 0d89ec0d-d39a-494d-ac5b-9d940d8cc65f - offering_id: 1444e20a-af22-40d1-af98-c880918849cb + catalog_id: 8611e025-10b2-488e-8261-a7f584a5114b + offering_id: bf3c07f8-5a62-4289-8ea0-94dbb2b410e6 # list all of the variations (flavors) you have included in the ibm_catalog.json variations: - name: Cluster-with-LSF @@ -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 diff --git a/ibm_catalog.json b/ibm_catalog.json index 4c101210..3719c3e9 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -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" @@ -694,6 +694,497 @@ } } ] + }, + { + "name": "terraform-ibm-modules-terraform-ibm-hpc-scale", + "label": "IBM Storage Scale", + "product_kind": "solution", + "tags": [ + "Deployable Architecture", + "DA", + "HPC", + "IBM Storage Scale", + "ibm_created", + "target_terraform", + "terraform", + "reference_architecture", + "solution" + ], + "keywords": [ + "scale", + "vpc", + "DA", + "Deployable Architecture", + "terraform", + "solution" + ], + "short_description": "Deploy your high performance computing (HPC) cluster with IBM scheduling software for compute intensive workloads.", + "long_description": "**Before you begin deploying IBM Cloud HPC, make sure that you meet the prerequisites listed in [the step-by-step guide](https://cloud.ibm.com/docs/allowlist/hpc-service?topic=hpc-service-before-you-begin-deploying).**\n\nIBM Cloud HPC is a deployable architecture where you can deploy both cloud compute resources (vCPU resources) and HPC scheduling software for your compute-intensive HPC workloads. You can reserve capacity on a recurring hourly basis from a dedicated IBM Cloud HPC resource pool.", + "provider_name": "IBM", + "offering_docs_url": "https://cloud.ibm.com/docs/allowlist/hpc-service?topic=hpc-service-overview", + "features": [ + { + "title": "Reserve HPC compute on an hourly basis", + "description": "Reserve HPC compute capacity on a recurring hourly basis. This reserved time slot and capacity cannot be preempted by IBM." + }, + { + "title": "HPC infrastructure bundled with LSF scheduling software", + "description": "Create a cluster with IBM Spectrum LSF in its own subnet and security group for HPC administrators to log in, submit, and manage HPC jobs." + }, + { + "title": "Automatic compute scaling with LSF resource connector", + "description": "Automatically scale up compute resources based on workload demand. Compute resources are automatically scaled down when no longer required." + } + ], + "flavors": [ + { + "label": "IBM Storage Scale", + "name": "scale", + "install_type": "fullstack", + "working_directory": "solutions/scale", + "compliance": { + "authority": "scc-v3", + "profiles": [ + { + "profile_name": "IBM Cloud Framework for Financial Services", + "profile_version": "1.5.0" + } + ] + }, + "release_notes_url": "https://cloud.ibm.com/docs/allowlist/hpc-service?topic=hpc-service-release-notes", + "configuration": [ + { + "key": "ibm_customer_number", + "required": true + }, + { + "key": "storage_gui_username", + "required": true + }, + { + "key": "storage_gui_password", + "required": true + }, + { + "key": "ibmcloud_api_key", + "required": true + }, + { + "key": "zones", + "required": true, + "default_value": ["us-east-1"], + "options": [ + { + "displayname": "Washington DC 1", + "value": ["us-east-1"] + }, + { + "displayname": "Washington DC 2", + "value": ["us-east-2"] + }, + { + "displayname": "Washington DC 3", + "value": ["us-east-3"] + }, + { + "displayname": "Frankfurt 1", + "value": ["eu-de-1"] + }, + { + "displayname": "Frankfurt 2", + "value": ["eu-de-2"] + }, + { + "displayname": "Frankfurt 3", + "value": ["eu-de-3"] + }, + { + "displayname": "Dallas 1", + "value": ["us-south-1"] + }, + { + "displayname": "Dallas 2", + "value": ["us-south-2"] + }, + { + "displayname": "Dallas 3", + "value": ["us-south-3"] + }, + { + "displayname": "Toronto 1", + "value": ["ca-tor-1"] + }, + { + "displayname": "Toronto 2", + "value": ["ca-tor-2"] + }, + { + "displayname": "Toronto 3", + "value": ["ca-tor-3"] + }, + { + "displayname": "Tokyo 1", + "value": ["jp-tok-1"] + }, + { + "displayname": "Tokyo 2", + "value": ["jp-tok-2"] + }, + { + "displayname": "Tokyo 3", + "value": ["jp-tok-3"] + }, + { + "displayname": "London 1", + "value": ["eu-gb-1"] + }, + { + "displayname": "London 2", + "value": ["eu-gb-2"] + }, + { + "displayname": "London 3", + "value": ["eu-gb-3"] + }, + { + "displayname": "Sydney 1", + "value": ["au-syd-1"] + }, + { + "displayname": "Sydney 2", + "value": ["au-syd-2"] + }, + { + "displayname": "Syndney 3", + "value": ["au-syd-3"] + }, + { + "displayname": "Osaka 1", + "value": ["jp-osa-1"] + }, + { + "displayname": "Osaka 2", + "value": ["jp-osa-2"] + }, + { + "displayname": "Osaka 3", + "value": ["jp-osa-3"] + }, + { + "displayname": "Sao Paulo 1", + "value": ["br-sao-1"] + }, + { + "displayname": "Sao Paulo 2", + "value": ["br-sao-2"] + }, + { + "displayname": "Sao Paulo 3", + "value": ["br-sao-3"] + } + ] + }, + { + "key": "ssh_keys", + "required": true + }, + { + "key": "remote_allowed_ips" + }, + { + "key": "cluster_prefix" + }, + { + "key": "existing_resource_group", + "required": true + }, + { + "key": "vpc_cidr" + }, + { + "key": "vpc_name" + }, + { + "key": "client_subnets_cidr" + }, + { + "key": "vpc_cluster_private_subnets_cidr_blocks" + }, + { + "key": "storage_subnets_cidr" + }, + { + "key": "protocol_subnets_cidr" + }, + { + "key": "placement_strategy" + }, + { + "key": "bastion_instance", + "type": "object", + "default_value": "{\n \"image\": \"ibm-ubuntu-22-04-5-minimal-amd64-3\",\n \"profile\": \"cx2-4x8\"\n}", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "deployer_instance", + "type": "object", + "default_value": "{\n \"image\": \"jay-lsf-new-image\",\n \"profile\": \"mx2-4x32\"\n}", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "client_instances", + "type": "object", + "default_value": "[\n {\n \"count\": 2,\n \"profile\": \"cx2-2x4\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "compute_instances", + "type": "object", + "default_value": "[\n {\n \"count\": 2,\n \"profile\": \"cx2-2x4\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "storage_instances", + "type": "object", + "default_value": "[\n {\n \"count\": 0,\n \"profile\": \"cx2-2x4\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "storage_servers", + "type": "object", + "default_value": "[\n {\n \"count\": 0,\n \"profile\": \"cx2d-metal-96x192\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "tie_breaker_bm_server", + "type": "object", + "default_value": "[\n {\n \"count\": 1,\n \"profile\": \"cx2d-metal-96x192\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "afm_instances", + "type": "object", + "default_value": "[\n {\n \"count\": 0,\n \"profile\": \"bx2-2x8\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "protocol_instances", + "type": "object", + "default_value": "[\n {\n \"count\": 2,\n \"profile\": \"bx2-2x8\",\n \"image\": \"ibm-redhat-8-10-minimal-amd64-4\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "filesystem_config", + "type": "object", + "default_value": "[\n {\n \"filesystem\": \"fs1\",\n \"block_size\": \"4M\",\n \"mount_point\": \"/ibm/fs1\",\n \"default_data_replica\": 2,\n \"default_metadata_replica\": 2,\n \"max_data_replica \": 3,\n \"count\": 3\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "afm_cos_config", + "type": "object", + "default_value": "[\n {\n \"afm_fileset\": \"afm_fileset\",\n \"mode\": \"iw\",\n \"cos_instance\": \"\",\n \"bucket_name\": \"\",\n \"bucket_region\": \"us-south\",\n \"cos_service_cred_key \": \"\",\n \"bucket_storage_class\": \"\",\n \"bucket_type\": \"region_location\"\n }\n]", + "required": false, + "custom_config": { + "type": "json_editor", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "type": "mixed" + } + } + }, + { + "key": "compute_gui_username" + }, + { + "key": "compute_gui_password" + }, + { + "key": "colocate_protocol_instances" + }, + { + "key": "dns_instance_id" + }, + { + "key": "dns_domain_names" + }, + { + "key": "dns_custom_resolver_id" + }, + { + "key": "key_management" + }, + { + "key": "hpcs_instance_name" + } + ], + "iam_permissions": [ + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::serviceRole:Manager" + ], + "service_name": "appid" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::serviceRole:Manager" + ], + "service_name": "cloud-object-storage" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::serviceRole:Manager" + ], + "service_name": "hs-crypto" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Administrator" + ], + "service_name": "iam-identity" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::serviceRole:Manager" + ], + "service_name": "kms" + }, + { + "role_crns": [ + "crn:v1:bluemix:public:iam::::role:Administrator" + ], + "service_name": "is.vpc" + } + ], + "architecture": { + "descriptions": "", + "features": [ + { + "title": "Separate VPC for HPC workloads", + "description": "Yes" + }, + { + "title": "Virtual Server Instances for every subnet", + "description": "Yes" + }, + { + "title": "Increases security with Key Management", + "description": "Yes" + }, + { + "title": "Reduces failure events by using multizone regions", + "description": "Yes" + }, + { + "title": "Collects and stores Internet Protocol (IP) traffic information with Activity Tracker and Flow Logs", + "description": "Yes" + }, + { + "title": "Securely connects to multiple networks with a site-to-site virtual private network", + "description": "Yes" + }, + { + "title": "Simplifies risk management and demonstrates regulatory compliance with Financial Services", + "description": "Yes" + }, + { + "title": "Uses Floating IP address for access through the public internet", + "description": "No" + } + ], + "diagrams": [ + { + "diagram": { + "caption": "IBM Storage Scale", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-landing-zone/main/reference-architectures/vsi-vsi.drawio.svg", + "type": "image/svg+xml" + }, + "description": "The HPC variation of the deployable architecture is based on the IBM Cloud for Financial Services reference architecture. The architecture creates a customizable and secure infrastructure, with virtual servers, to run your workloads with a Virtual Private Cloud (VPC) in multizone regions." + } + ] + } + } + ] } ] }