From a6f3367e85fe7c64d2cdd56e317d4a4101a9005a Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Mon, 21 Jul 2025 15:49:06 +0200 Subject: [PATCH 1/5] fix: enable p10 in us-south --- modules/pi-sap-system-type1/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pi-sap-system-type1/main.tf b/modules/pi-sap-system-type1/main.tf index a8bd4d8c..5cb7672f 100644 --- a/modules/pi-sap-system-type1/main.tf +++ b/modules/pi-sap-system-type1/main.tf @@ -19,7 +19,7 @@ locals { # Set server type based on region ##################################################### locals { - p10_unsupported_regions = ["che01", "lon04", "lon06", "mon01", "syd04", "syd05", "tor01", "us-east", "us-south"] # datacenters that don't support P10 yet + p10_unsupported_regions = ["che01", "lon04", "lon06", "mon01", "syd04", "syd05", "tor01", "us-east"] # datacenters that don't support P10 yet server_type = contains(local.p10_unsupported_regions, var.pi_region) ? "s922" : "s1022" } From c1397febdfa06babc2221068d9236281d4fb6173 Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Mon, 21 Jul 2025 15:56:08 +0200 Subject: [PATCH 2/5] docs: lastupdated and version --- .../sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md | 4 ++-- .../deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md b/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md index 66804549..d4edbb54 100644 --- a/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md +++ b/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md @@ -2,7 +2,7 @@ copyright: years: 2024, 2025 -lastupdated: "2025-05-07" +lastupdated: "2025-07-21" keywords: subcollection: deployable-reference-architectures authors: @@ -17,7 +17,7 @@ use-case: ITServiceManagement industry: Technology compliance: SAPCertified content-type: reference-architecture -version: v4.2.0 +version: v4.2.1 related_links: - title: 'SAP in IBM Cloud documentation' url: 'https://cloud.ibm.com/docs/sap' diff --git a/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md b/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md index dc8f9330..73637885 100644 --- a/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md +++ b/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md @@ -2,7 +2,7 @@ copyright: years: 2024, 2025 -lastupdated: "2025-05-07" +lastupdated: "2025-07-21" keywords: subcollection: deployable-reference-architectures authors: @@ -17,7 +17,7 @@ use-case: ITServiceManagement industry: Technology compliance: SAPCertified content-type: reference-architecture -version: v4.2.0 +version: v4.2.1 related_links: - title: 'SAP in IBM Cloud documentation' url: 'https://cloud.ibm.com/docs/sap' From 9bb6d0d5087fec5ef8416bed99e697be6fce47ca Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Mon, 21 Jul 2025 16:24:08 +0200 Subject: [PATCH 3/5] fix: add enable attribute to scc_wp_instance sample tfvars --- solutions/sap-ready-to-go/input.tfvars | 1 + 1 file changed, 1 insertion(+) diff --git a/solutions/sap-ready-to-go/input.tfvars b/solutions/sap-ready-to-go/input.tfvars index 7f973fdb..b917dd6d 100644 --- a/solutions/sap-ready-to-go/input.tfvars +++ b/solutions/sap-ready-to-go/input.tfvars @@ -26,6 +26,7 @@ sap_network_services_config = { } scc_wp_instance = { + enable = false guid = "", access_key = "", api_endpoint = "", From 4cba50a3dc53aafb2c083864bfeb5a3e0578b519 Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Mon, 21 Jul 2025 16:25:30 +0200 Subject: [PATCH 4/5] docs: toc version and ref architecture version --- ibm_catalog.json | 4 ++-- .../sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md | 2 +- .../deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 700cf5b8..193e0795 100755 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -362,7 +362,7 @@ { "diagram": { "caption": "Full SAP environment provisioned on a 'Power Virtual Server with VPC landing zone'", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.1.0/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.2.1/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.svg", "type": "image/svg+xml" }, "description": "'SAP ready PowerVS' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape builds on the foundation of the 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and preconfigured for SAP installation.\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 'Power Virtual Server with VPC landing zone'." @@ -759,7 +759,7 @@ { "diagram": { "caption": "Full SAP S/4HANA or BW/4HANA environment provisioned on a 'Power Virtual Server with VPC landing zone'", - "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.1.0/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg", + "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-sap/refs/tags/v4.2.1/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.svg", "type": "image/svg+xml" }, "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." diff --git a/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md b/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md index d4edbb54..fbe668f8 100644 --- a/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md +++ b/reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md @@ -39,7 +39,7 @@ related_links: {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v4.2.0"} +{: toc-version="v4.2.1"} The SAP-ready PowerVS variation of the Power Virtual Server for SAP HANA creates a basic and expandable SAP system landscape. The variation builds on the foundation of the VPC landing zone and Power Virtual Server with VPC landing zone. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and pre-configured for SAP installation. diff --git a/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md b/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md index 73637885..d08b49de 100644 --- a/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md +++ b/reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md @@ -39,7 +39,7 @@ related_links: {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v4.2.0"} +{: toc-version="v4.2.1"} 'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape built on the foundation of 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA and SAP NetWeaver are deployed and pre-configured for SAP installation. The S/4HANA or BW/4HANA solution is installed based on the selected version. From da248ead1df7101733949beadee0df6dbf5ffa34 Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Mon, 21 Jul 2025 17:28:13 +0200 Subject: [PATCH 5/5] chore(deps): update landing zone version to 8.5.6 --- solutions/e2e/README.md | 2 +- solutions/e2e/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md index d6b1115b..316e296d 100644 --- a/solutions/e2e/README.md +++ b/solutions/e2e/README.md @@ -53,7 +53,7 @@ The end-to-end solution automates the following tasks: | Name | Source | Version | |------|--------|---------| | [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a | -| [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.5.5 | +| [standard](#module\_standard) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.5.6 | ### Resources diff --git a/solutions/e2e/main.tf b/solutions/e2e/main.tf index 6006ab1c..e6f2f23d 100644 --- a/solutions/e2e/main.tf +++ b/solutions/e2e/main.tf @@ -7,7 +7,7 @@ module "standard" { source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone" - version = "8.5.5" + version = "8.5.6" providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi, ibm.ibm-sm = ibm.ibm-sm }