Skip to content

Commit 9bbedff

Browse files
authored
feat: Restructured the DA code to integrate Ansible and standardize user input formats (#266)
BREAKING CHANGE: Added support for Fix Pack 15. Deprecated the use of the SCC instance. Introduced support for SCC Workload Protection Updated Offering ID
1 parent bfa7861 commit 9bbedff

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.catalog-onboard-pipeline.yaml

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

samples/configs/hpc_schematics_values.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
"value": "__NULL__",
270270
"type": "string",
271271
"secure": false,
272-
"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)."
272+
"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)."
273273
},
274274
{
275275
"name": "enable_vpc_flow_logs",

solutions/lsf/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ variable "kms_instance_name" {
475475
variable "kms_key_name" {
476476
type = string
477477
default = null
478-
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)."
478+
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)."
479479
validation {
480480
condition = anytrue([alltrue([var.kms_key_name != null, var.kms_instance_name != null]), (var.kms_key_name == null), (var.key_management != "key_protect")])
481481
error_message = "Please make sure you are passing the kms_instance_name if you are passing kms_key_name."

variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ variable "login_instance" {
10711071
profile = "bx2-2x8"
10721072
image = "hpcaas-lsf10-rhel810-compute-v8"
10731073
}]
1074-
description = "Number of instances to be launched for login node."
1074+
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."
10751075
}
10761076

10771077
##############################################################################
@@ -1101,7 +1101,7 @@ variable "TF_PARALLELISM" {
11011101
##############################################################################
11021102

11031103
variable "sccwp_service_plan" {
1104-
description = "IBM service pricing plan."
1104+
description = "Specify the plan type for the Security and Compliance Center (SCC) Workload Protection instance. Valid values are free-trial and graduated-tier only."
11051105
type = string
11061106
default = "free-trial"
11071107
validation {
@@ -1116,11 +1116,11 @@ variable "sccwp_service_plan" {
11161116
variable "sccwp_enable" {
11171117
type = bool
11181118
default = true
1119-
description = "Flag to enable SCC instance creation. If true, an instance of SCC (Security and Compliance Center) will be created."
1119+
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)."
11201120
}
11211121

11221122
variable "cspm_enabled" {
1123-
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)."
1123+
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)."
11241124
type = bool
11251125
default = false
11261126
nullable = false

0 commit comments

Comments
 (0)