Skip to content

Commit 2c6e40d

Browse files
tripan27tripan27
committed
chore: fix code review comment
SKIP UPGRADE TEST: breaking change
1 parent b9e5019 commit 2c6e40d

File tree

9 files changed

+51
-108
lines changed

9 files changed

+51
-108
lines changed

‎.secrets.baseline‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2025-10-16T16:10:27Z",
6+
"generated_at": "2025-10-22T06:26:42Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -2335,15 +2335,15 @@
23352335
"verified_result": null
23362336
},
23372337
{
2338-
"hashed_secret": "0e5aa94eb90d8d50556e158b6ef5f0d750841485",
2338+
"hashed_secret": "09c6049090b3e012271b94e22825f048b7fb04a3",
23392339
"is_secret": false,
23402340
"is_verified": false,
23412341
"line_number": 299,
23422342
"type": "Base64 High Entropy String",
23432343
"verified_result": null
23442344
},
23452345
{
2346-
"hashed_secret": "9f37646f3f5d0b9b91e254f7d857aa1eded4a2d5",
2346+
"hashed_secret": "b29c5e0104f417d687b7451bfeb7e4aa7ac0168f",
23472347
"is_secret": false,
23482348
"is_verified": false,
23492349
"line_number": 300,

‎ibm_catalog.json‎

Lines changed: 38 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,6 @@
348348
"type": "code_editor"
349349
}
350350
},
351-
{
352-
"key": "existing_monitoring_instance_crn"
353-
},
354351
{
355352
"key": "sm_service_plan"
356353
},
@@ -575,23 +572,6 @@
575572
"required": true,
576573
"default_value": ""
577574
},
578-
{
579-
"key": "os_image_distro",
580-
"type": "string",
581-
"default_value": "",
582-
"required": true,
583-
"options": [
584-
{
585-
"displayname": "RHEL",
586-
"value": "RHEL"
587-
},
588-
{
589-
"displayname": "SLES",
590-
"value": "SLES"
591-
}
592-
],
593-
"custom_config": {}
594-
},
595575
{
596576
"key": "powervs_hana_instance_sap_profile_id",
597577
"required": true
@@ -647,11 +627,27 @@
647627
}
648628
},
649629
{
650-
"key": "client_to_site_vpn",
651-
"required": true
630+
"key": "ibmcloud_cos_service_credentials",
631+
"type": "multiline_secure_value",
632+
"display_name": "ibmcloud_cos_service_credentials",
633+
"required": true,
634+
"custom_config": {
635+
"grouping": "deployment",
636+
"original_grouping": "deployment",
637+
"type": "multiline_secure_value"
638+
}
652639
},
653640
{
654-
"key": "sap_domain",
641+
"key": "ibmcloud_cos_configuration",
642+
"required": true,
643+
"custom_config": {
644+
"grouping": "deployment",
645+
"original_grouping": "deployment",
646+
"type": "code_editor"
647+
}
648+
},
649+
{
650+
"key": "client_to_site_vpn",
655651
"required": true
656652
},
657653
{
@@ -666,18 +662,6 @@
666662
"key": "nfs_server_config",
667663
"required": true
668664
},
669-
{
670-
"key": "ansible_vault_password",
671-
"type": "multiline_secure_value",
672-
"required": true,
673-
"default_value": "__NULL__",
674-
"display_name": "ansible_vault_password",
675-
"custom_config": {
676-
"grouping": "deployment",
677-
"original_grouping": "deployment",
678-
"type": "multiline_secure_value"
679-
}
680-
},
681665
{
682666
"key": "powervs_hana_instance_name"
683667
},
@@ -762,26 +746,6 @@
762746
"type": "multiline_secure_value"
763747
}
764748
},
765-
{
766-
"key": "ibmcloud_cos_service_credentials",
767-
"type": "multiline_secure_value",
768-
"display_name": "ibmcloud_cos_service_credentials",
769-
"required": true,
770-
"custom_config": {
771-
"grouping": "deployment",
772-
"original_grouping": "deployment",
773-
"type": "multiline_secure_value"
774-
}
775-
},
776-
{
777-
"key": "ibmcloud_cos_configuration",
778-
"required": true,
779-
"custom_config": {
780-
"grouping": "deployment",
781-
"original_grouping": "deployment",
782-
"type": "code_editor"
783-
}
784-
},
785749
{
786750
"key": "sap_solution",
787751
"type": "string",
@@ -861,15 +825,28 @@
861825
}
862826
},
863827
{
864-
"key": "tags",
828+
"key": "sap_domain",
829+
"required": true
830+
},
831+
{
832+
"key": "ansible_vault_password",
833+
"type": "multiline_secure_value",
834+
"required": true,
835+
"default_value": "__NULL__",
836+
"display_name": "ansible_vault_password",
865837
"custom_config": {
866838
"grouping": "deployment",
867839
"original_grouping": "deployment",
868-
"type": "code_editor"
840+
"type": "multiline_secure_value"
869841
}
870842
},
871843
{
872-
"key": "existing_monitoring_instance_crn"
844+
"key": "tags",
845+
"custom_config": {
846+
"grouping": "deployment",
847+
"original_grouping": "deployment",
848+
"type": "code_editor"
849+
}
873850
},
874851
{
875852
"key": "sm_service_plan"
@@ -937,8 +914,8 @@
937914
"architecture": {
938915
"features": [
939916
{
940-
"title": "Power Virtual Server with VPC landing zone Standard Variation",
941-
"description": "Pre Requisite"
917+
"title": "VPC and PowerVS are created along with network management services such as Bastion host, internet proxy based on SQUID, NTP forwarder, DNS forwarder, and NFS as a service.",
918+
"description": "Installed: VPC and powerVS with network management services"
942919
},
943920
{
944921
"title": "SAP Solution",
@@ -957,7 +934,7 @@
957934
{
958935
"diagram": {
959936
"caption": "Full SAP S/4HANA or BW/4HANA environment provisioned on a 'Power Virtual Server with VPC landing zone'",
960-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.2.2/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
937+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v5.0.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg",
961938
"type": "image/svg+xml"
962939
},
963940
"description": "'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape builds on the foundation of 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and preconfigured for SAP installation. S/4HANA or BW/4HANA solution is installed based on selected version. \n\nServices such as DNS, NTP and NFS running in VPC and provided by 'Power Virtual Server with VPC landing zone' are leveraged.\n\nThe resulting SAP landscape leverages the services such as Activity Tracker, Cloud Object Storage, Key Management and the network connectivity configuration provided by the 'Power Virtual Server with VPC landing zone'. Additionally if a Monitoring Instance was configured in the 'Power Virtual Server with VPC landing zone' deployment, this solution will then install and enable SAP monitoring Dashboard."

‎solutions/ibm-catalog/sap-ready-to-go/README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@
8989
|------|-------------|------|---------|:--------:|
9090
| <a name="input_ansible_vault_password"></a> [ansible\_vault\_password](#input\_ansible\_vault\_password) | Vault password to encrypt ansible playbooks that contain sensitive information. Required when SCC workload Protection is enabled. Password requirements: 15-100 characters and at least one uppercase letter, one lowercase letter, one number, and one special character. Allowed characters: A-Z, a-z, 0-9, !#$%&()*+-.:;<=>?@[]\_{\|}~. | `string` | `""` | no |
9191
| <a name="input_client_to_site_vpn"></a> [client\_to\_site\_vpn](#input\_client\_to\_site\_vpn) | VPN configuration - the client ip pool and list of users email ids to access the environment. If enabled, then a Secret Manager instance is also provisioned with certificates generated. See optional parameters to reuse an existing Secrets manager instance. | <pre>object({<br/> enable = bool<br/> client_ip_pool = string<br/> vpn_client_access_group_users = list(string)<br/> })</pre> | <pre>{<br/> "client_ip_pool": "192.168.0.0/16",<br/> "enable": true,<br/> "vpn_client_access_group_users": []<br/>}</pre> | no |
92-
| <a name="input_enable_monitoring"></a> [enable\_monitoring](#input\_enable\_monitoring) | Specify whether Monitoring will be enabled. This includes the creation of an IBM Cloud Monitoring Instance and an Intel Monitoring Instance to host the services. If you already have an existing monitoring instance then specify in optional parameter 'existing\_monitoring\_instance\_crn'. | `bool` | n/a | yes |
92+
| <a name="input_enable_monitoring"></a> [enable\_monitoring](#input\_enable\_monitoring) | Specify whether Monitoring will be enabled. This creates a new IBM Cloud Monitoring Instance. | `bool` | `false` | no |
9393
| <a name="input_enable_scc_wp"></a> [enable\_scc\_wp](#input\_enable\_scc\_wp) | Set to true to enable SCC Workload Protection and install and configure the SCC Workload Protection agent on all VSIs and PowerVS instances in this deployment. | `bool` | n/a | yes |
94-
| <a name="input_existing_monitoring_instance_crn"></a> [existing\_monitoring\_instance\_crn](#input\_existing\_monitoring\_instance\_crn) | Existing CRN of IBM Cloud Monitoring Instance. If value is null, then an IBM Cloud Monitoring Instance will not be created but an intel VSI instance will be created if 'enable\_monitoring' is true. | `string` | `null` | no |
9594
| <a name="input_existing_sm_instance_guid"></a> [existing\_sm\_instance\_guid](#input\_existing\_sm\_instance\_guid) | An existing Secrets Manager GUID. If not provided a new instance will be provisioned. | `string` | `null` | no |
9695
| <a name="input_existing_sm_instance_region"></a> [existing\_sm\_instance\_region](#input\_existing\_sm\_instance\_region) | Required if value is passed into `var.existing_sm_instance_guid`. | `string` | `null` | no |
9796
| <a name="input_external_access_ip"></a> [external\_access\_ip](#input\_external\_access\_ip) | Specify the IP address or CIDR to login through SSH to the environment after deployment. Access to this environment will be allowed only from this IP address. | `string` | n/a | yes |

‎solutions/ibm-catalog/sap-ready-to-go/main.tf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ module "standard" {
3737
existing_sm_instance_guid = var.existing_sm_instance_guid
3838
existing_sm_instance_region = var.existing_sm_instance_region
3939
enable_monitoring = var.enable_monitoring
40-
existing_monitoring_instance_crn = var.existing_monitoring_instance_crn
4140
enable_scc_wp = var.enable_scc_wp
4241
ansible_vault_password = var.ansible_vault_password
4342
vpc_subnet_cidrs = var.vpc_subnet_cidrs

‎solutions/ibm-catalog/sap-ready-to-go/variables.tf‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,9 @@ variable "existing_sm_instance_region" {
330330
#####################################################
331331

332332
variable "enable_monitoring" {
333-
description = "Specify whether Monitoring will be enabled. This includes the creation of an IBM Cloud Monitoring Instance and an Intel Monitoring Instance to host the services. If you already have an existing monitoring instance then specify in optional parameter 'existing_monitoring_instance_crn'."
333+
description = "Specify whether Monitoring will be enabled. This creates a new IBM Cloud Monitoring Instance."
334334
type = bool
335-
}
336-
337-
variable "existing_monitoring_instance_crn" {
338-
description = "Existing CRN of IBM Cloud Monitoring Instance. If value is null, then an IBM Cloud Monitoring Instance will not be created but an intel VSI instance will be created if 'enable_monitoring' is true. "
339-
type = string
340-
default = null
335+
default = false
341336
}
342337

343338
#################################################

0 commit comments

Comments
 (0)