Skip to content

Commit b4410dd

Browse files
nupurg-ibmNupur Goyal
and
Nupur Goyal
authored
fix: Creation of new custom image to support the removal of ICN(#211)
Co-authored-by: Nupur Goyal <[email protected]>
1 parent c124a4a commit b4410dd

File tree

9 files changed

+21
-22
lines changed

9 files changed

+21
-22
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ $ ibmcloud schematics logs --id us-east.workspace.hpcc-cluster.7cbc3f6b
6969
2025/02/18 15:00:57 Terraform apply |
7070
2025/02/18 15:00:57 Terraform apply | Outputs:
7171
2025/02/18 15:00:57 Terraform apply |
72-
2025/02/18 15:00:57 Terraform apply | image_entry_found = "true -- - hpc-lsf10-rhel810-v1"
72+
2025/02/18 15:00:57 Terraform apply | image_entry_found = "true -- - hpc-lsf10-rhel810-v2"
7373
2025/02/18 15:00:57 Terraform apply | region_name = "us-east"
7474
2025/02/18 15:00:57 Terraform apply | remote_allowed_cidr = [
7575
2025/02/18 15:00:57 Terraform apply | "xxxxxxxx",

modules/landing_zone_vsi/README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
| Name | Version |
1212
|------|---------|
13-
| <a name="provider_ibm"></a> [ibm](#provider\_ibm) | 1.59.0 |
14-
| <a name="provider_template"></a> [template](#provider\_template) | 2.2.0 |
13+
| <a name="provider_ibm"></a> [ibm](#provider\_ibm) | >= 1.56.2 |
14+
| <a name="provider_template"></a> [template](#provider\_template) | ~> 2 |
1515

1616
## Modules
1717

@@ -25,7 +25,6 @@
2525
| <a name="module_generate_db_password"></a> [generate\_db\_password](#module\_generate\_db\_password) | ../../modules/security/password | n/a |
2626
| <a name="module_ldap_vsi"></a> [ldap\_vsi](#module\_ldap\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.5.0 |
2727
| <a name="module_login_vsi"></a> [login\_vsi](#module\_login\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.5.0 |
28-
| <a name="module_lsf_entitlement"></a> [lsf\_entitlement](#module\_lsf\_entitlement) | ./../../modules/null/remote_exec | n/a |
2928
| <a name="module_management_candidate_vsi"></a> [management\_candidate\_vsi](#module\_management\_candidate\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.5.0 |
3029
| <a name="module_management_vsi"></a> [management\_vsi](#module\_management\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.5.0 |
3130
| <a name="module_nfs_storage_sg"></a> [nfs\_storage\_sg](#module\_nfs\_storage\_sg) | terraform-ibm-modules/security-group/ibm | 2.6.2 |
@@ -82,7 +81,7 @@
8281
| <a name="input_compute_subnets"></a> [compute\_subnets](#input\_compute\_subnets) | Subnets to launch the compute host. | <pre>list(object({<br> name = string<br> id = string<br> zone = string<br> cidr = string<br> crn = string<br> }))</pre> | `[]` | no |
8382
| <a name="input_contract_id"></a> [contract\_id](#input\_contract\_id) | Ensure that you have received the contract ID from IBM technical sales. Contract ID is a unique identifier to distinguish different IBM Cloud HPC service agreements. It must start with a letter and can only contain letters, numbers, hyphens (-), or underscores (\_). | `string` | n/a | yes |
8483
| <a name="input_db_admin_password"></a> [db\_admin\_password](#input\_db\_admin\_password) | The IBM Cloud Database for MySQL password required to reference the PAC database. | `string` | `null` | no |
85-
| <a name="input_db_instance_info"></a> [db\_instance\_info](#input\_db\_instance\_info) | The IBM Cloud Database for MySQL information required to reference the PAC database. | <pre>object({<br> id = string<br> admin_user = string<br> hostname = string<br> port = number<br> certificate = string<br> })</pre> | `null` | no |
84+
| <a name="input_db_instance_info"></a> [db\_instance\_info](#input\_db\_instance\_info) | The IBM Cloud Database for MySQL information required to reference the PAC database. | <pre>object({<br> id = string<br> admin_user = string<br> hostname = string<br> port = number<br> certificate = string<br> })</pre> | `null` | no |
8685
| <a name="input_dedicated_host_id"></a> [dedicated\_host\_id](#input\_dedicated\_host\_id) | Dedicated Host for the worker nodes | `string` | `null` | no |
8786
| <a name="input_dns_domain_names"></a> [dns\_domain\_names](#input\_dns\_domain\_names) | IBM Cloud HPC DNS domain names. | <pre>object({<br> compute = string<br> #storage = string<br> #protocol = string<br> })</pre> | <pre>{<br> "compute": "comp.com",<br> "protocol": "ces.com",<br> "storage": "strg.com"<br>}</pre> | no |
8887
| <a name="input_enable_app_center"></a> [enable\_app\_center](#input\_enable\_app\_center) | Set to true to enable the IBM Spectrum LSF Application Center GUI (default: false). [System requirements](https://www.ibm.com/docs/en/slac/10.2.0?topic=requirements-system-102-fix-pack-14) for IBM Spectrum LSF Application Center Version 10.2 Fix Pack 14. | `bool` | `false` | no |
@@ -105,7 +104,7 @@
105104
| <a name="input_login_image_name"></a> [login\_image\_name](#input\_login\_image\_name) | Image name to use for provisioning the login instance. | `string` | `"hpcaas-lsf10-rhel810-compute-v8"` | no |
106105
| <a name="input_login_node_instance_type"></a> [login\_node\_instance\_type](#input\_login\_node\_instance\_type) | Specify the virtual server instance profile type to be used to create the login node for the IBM Cloud HPC cluster. For choices on profile types, see [Instance profiles](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles). | `string` | `"bx2-2x8"` | no |
107106
| <a name="input_login_private_ips"></a> [login\_private\_ips](#input\_login\_private\_ips) | Login private IPs | `string` | n/a | yes |
108-
| <a name="input_management_image_name"></a> [management\_image\_name](#input\_management\_image\_name) | Image name to use for provisioning the management cluster instances. | `string` | `"hpcaas-lsf10-rhel810-v12"` | no |
107+
| <a name="input_management_image_name"></a> [management\_image\_name](#input\_management\_image\_name) | Image name to use for provisioning the management cluster instances. | `string` | n/a | yes |
109108
| <a name="input_management_node_count"></a> [management\_node\_count](#input\_management\_node\_count) | Number of management nodes. This is the total number of management nodes. Enter a value between 1 and 10. | `number` | `3` | no |
110109
| <a name="input_management_node_instance_type"></a> [management\_node\_instance\_type](#input\_management\_node\_instance\_type) | Specify the virtual server instance profile type to be used to create the management nodes for the IBM Cloud HPC cluster. For choices on profile types, see [Instance profiles](https://cloud.ibm.com/docs/vpc?topic=vpc-profiles). | `string` | `"bx2-16x64"` | no |
111110
| <a name="input_mount_path"></a> [mount\_path](#input\_mount\_path) | Provide the path for the vpc file share to be mounted on to the HPC Cluster nodes | <pre>list(object({<br> mount_path = string,<br> size = optional(number),<br> iops = optional(number),<br> nfs_share = optional(string)<br> }))</pre> | n/a | yes |

modules/landing_zone_vsi/configuration_steps/configure_management_vsi.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ cat <<EOT > "$LSF_RC_IC_CONF"/ibmcloudgen2_templates.json
327327
{
328328
"templates": [
329329
{
330-
"templateId": "Template-1",
330+
"templateId": "Template-${cluster_prefix}-1",
331331
"maxNumber": "$rc_max_num",
332332
"attributes": {
333333
"type": ["String", "X86_64"],

modules/landing_zone_vsi/image_map.tf

+11-10
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ locals {
2121
"eu-de" = "r010-1c8df3b1-8def-45eb-82ac-ab2db1612bd9"
2222
"us-south" = "r006-045e03ee-4cfa-4415-a4ec-d8bceadc1bdb"
2323
},
24-
"hpc-lsf10-rhel810-v1" = {
25-
"eu-gb" = "r018-3e1a8229-1f66-4349-a9ee-fd618f07a233"
26-
"eu-de" = "r010-627f3de3-e5e2-4bd1-80db-404fcc6acf3d"
27-
"us-east" = "r014-cdd9cf63-b5c6-4811-b1e8-3ae91a4deba9"
28-
"us-south" = "r006-7a738891-044f-47df-b08d-8d5126c421e7"
29-
"jp-tok" = "r022-745149bd-5fba-460a-848b-b1eda44734d4"
30-
"jp-osa" = "r034-3813573e-70d8-4943-b635-16dc282b4950"
31-
"au-syd" = "r026-a4324f42-992a-4cc8-995e-f613e4d7f550"
32-
"br-sao" = "r042-f82a29ba-dedc-429a-a983-7b6aee9f4a37"
33-
"ca-tor" = "r038-4e771ac3-3339-403c-946a-95a67b23a929"
24+
"hpc-lsf10-rhel810-v2" = {
25+
"eu-es" = "r050-4f5c092b-aeaf-483c-bcf8-f9d3c39199c6"
26+
"eu-gb" = "r018-74ea9522-076f-4b51-b8f3-b11db07b663f"
27+
"eu-de" = "r010-8800a619-c9f2-4519-af4c-f6d626825dd5"
28+
"us-east" = "r014-2ad1515b-38b9-4b46-8ff1-0a0488590c67"
29+
"us-south" = "r006-724e700a-d5c3-42e6-9559-8808bd359ef4"
30+
"jp-tok" = "r022-e54fad74-7b2f-4ed1-8c2d-b6436f880cf1"
31+
"jp-osa" = "r034-43c31e3f-008a-45d0-89b1-fbd8ed51b3fe"
32+
"au-syd" = "r026-fcfdd9b4-23e6-445b-bebe-4f9b8cdaa16f"
33+
"br-sao" = "r042-6f8cbdf8-bfd9-4127-86b3-b130e1ce2b36"
34+
"ca-tor" = "r038-e374450a-c76a-4a3b-9440-4e3787d17221"
3435
}
3536
}
3637
}

modules/landing_zone_vsi/variables.tf

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ variable "compute_ssh_keys" {
115115

116116
variable "management_image_name" {
117117
type = string
118-
default = "hpcaas-lsf10-rhel810-v12"
119118
description = "Image name to use for provisioning the management cluster instances."
120119
}
121120

samples/configs/hpc_catalog_values.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"enable_cos_integration" : "false",
2020
"cos_instance_name" : "__NULL__",
2121
"enable_fip" : "true",
22-
"management_image_name" : "hpcaas-lsf10-rhel810-v1",
22+
"management_image_name" : "hpc-lsf10-rhel810-v2",
2323
"compute_image_name" : "hpcaas-lsf10-rhel810-compute-v8",
2424
"login_image_name" : "hpcaas-lsf10-rhel810-compute-v8",
2525
"login_node_instance_type" : "bx2-2x8",

samples/configs/hpc_schematics_values.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
},
191191
{
192192
"name": "management_image_name",
193-
"value": "hpcaas-lsf10-rhel810-v1",
193+
"value": "hpc-lsf10-rhel810-v2",
194194
"type": "string",
195195
"secure": false,
196196
"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 Spectrum LSF cluster management nodes. By default, the solution uses a RHEL810 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 lsf cluster through this offering."

solutions/hpc/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ variable "login_node_instance_type" {
184184

185185
variable "management_image_name" {
186186
type = string
187-
default = "hpc-lsf10-rhel810-v1"
187+
default = "hpc-lsf10-rhel810-v2"
188188
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 Spectrum LSF cluster management nodes. By default, the solution uses a RHEL810 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 lsf cluster through this offering."
189189
}
190190

tests/lsf_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cluster_name: HPC-LSF-1
66
remote_allowed_ips:
77
ssh_key: geretain-hpc
88
login_node_instance_type: bx2-2x8
9-
management_image_name: "hpc-lsf10-rhel810-v1"
9+
management_image_name: "hpc-lsf10-rhel810-v2"
1010
compute_image_name: "hpcaas-lsf10-rhel810-compute-v8"
1111
login_image_name: "hpcaas-lsf10-rhel810-compute-v8"
1212
management_node_instance_type: bx2-2x8

0 commit comments

Comments
 (0)