Skip to content

Commit a79d03c

Browse files
authored
fix: SAP SWPM hdbuserstore config fix (#603)
1 parent e3581f5 commit a79d03c

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

.secrets.baseline

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2023-12-09T06:58:51Z",
6+
"generated_at": "2024-01-29T11:30:25Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"

modules/templates-ansible/s4hanab4hana-solution/playbook-sap-swpm-install.yml.tftpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@
8585
name: { role: community.sap_install.sap_swpm }
8686

8787
- name: SAP SWPM Post Install - Enforce Connection Info in hdbuserstore
88-
ansible.builtin.shell: "runuser -l {{sap_swpm_sid|lower}}adm -c 'hdbuserstore SET DEFAULT {{ sap_swpm_db_host }}:3{{ sap_swpm_db_instance_nr }}13 {{ sap_swpm_db_schema_abap }} '{{ sap_swpm_db_system_password }}"
88+
ansible.builtin.shell: "runuser -l {{sap_swpm_sid|lower}}adm -c 'hdbuserstore SET DEFAULT {{ sap_swpm_db_host }}:3{{ sap_swpm_db_instance_nr }}15 {{ sap_swpm_db_schema_abap }} '{{ sap_swpm_db_system_password }}"

solutions/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The end-to-end solution automates the following tasks:
5858

5959
| Name | Source | Version |
6060
|------|--------|---------|
61-
| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 4.2.0 |
61+
| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 4.3.0 |
6262
| <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
6363

6464
### Resources

solutions/e2e/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
module "fullstack" {
99
source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
10-
version = "4.2.0"
10+
version = "4.3.0"
1111

1212
providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi }
1313

tests/pr_test.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ func setupOptions(t *testing.T, prefix string) *testhelper.TestOptions {
4444
Region: "us-south", // specify default region to skip best choice query
4545
DefaultRegion: "us-south",
4646
BestRegionYAMLPath: "../common-dev-assets/common-go-assets/cloudinfo-region-power-prefs.yaml", // specific to powervs zones
47+
// temporary workaround for BSS backend issue
48+
ImplicitDestroy: []string{
49+
"module.fullstack.module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups",
50+
},
4751
})
4852

4953
// query for best zone to deploy powervs example, based on current connection count
@@ -57,8 +61,8 @@ func setupOptions(t *testing.T, prefix string) *testhelper.TestOptions {
5761

5862
options.TerraformVars = map[string]interface{}{
5963
// locking into syd04 due to other data center issues
60-
//"powervs_zone": "eu-de-2",
61-
"powervs_zone": options.Region,
64+
"powervs_zone": "eu-de-1",
65+
//"powervs_zone": options.Region,
6266
"prefix": options.Prefix,
6367
"powervs_resource_group_name": options.ResourceGroup,
6468
"landing_zone_configuration": "3VPC_RHEL",

0 commit comments

Comments
 (0)