From fd6c6be00c8056dedb0e7a9c949ecab934c4526e Mon Sep 17 00:00:00 2001 From: surajsbharadwaj <101711050+surajsbharadwaj@users.noreply.github.com> Date: Fri, 13 Dec 2024 13:50:20 +0100 Subject: [PATCH] feat: support lon04 for deployment; add dal14 DC for future deployment (#755) --- ibm_catalog.json | 8 ++++++++ .../deploy-arch-ibm-pvs-sap-ready-to-go.md | 6 +++--- .../deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md | 6 +++--- solutions/e2e/README.md | 2 +- solutions/e2e/main.tf | 2 +- solutions/e2e/provider.tf | 2 ++ solutions/ibm-catalog/sap-ready-to-go/provider.tf | 1 + solutions/ibm-catalog/sap-s4hana-bw4hana/provider.tf | 1 + solutions/sap-ready-to-go/provider.tf | 1 + 9 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 8ebb3849..6294c92c 100755 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -104,6 +104,10 @@ "displayname": "Frankfurt 2 (eu-de-2)", "value": "eu-de-2" }, + { + "displayname": "London 04 (lon04)", + "value": "lon04" + }, { "displayname": "London 06 (lon06)", "value": "lon06" @@ -417,6 +421,10 @@ "displayname": "Frankfurt 2 (eu-de-2)", "value": "eu-de-2" }, + { + "displayname": "London 04 (lon04)", + "value": "lon04" + }, { "displayname": "London 06 (lon06)", "value": "lon06" 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 5a2cd16d..6ef63b01 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 -lastupdated: "2024-12-11" +lastupdated: "2024-12-13" keywords: subcollection: deployable-reference-architectures authors: @@ -16,7 +16,7 @@ use-case: ITServiceManagement industry: Technology compliance: SAPCertified content-type: reference-architecture -version: v3.2.1 +version: v3.3.0 related_links: - title: 'SAP in IBM Cloud documentation' url: 'https://cloud.ibm.com/docs/sap' @@ -38,7 +38,7 @@ related_links: {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="3.2.1"} +{: toc-version="3.3.0"} 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, SAP NetWeaver, and optionally for shared SAP files are deployed and preconfigured 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 3e9be1a5..d537b4a4 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 -lastupdated: "2024-12-11" +lastupdated: "2024-12-13" keywords: subcollection: deployable-reference-architectures authors: @@ -16,7 +16,7 @@ use-case: ITServiceManagement industry: Technology compliance: SAPCertified content-type: reference-architecture -version: v3.2.1 +version: v3.3.0 related_links: - title: 'SAP in IBM Cloud documentation' url: 'https://cloud.ibm.com/docs/sap' @@ -38,7 +38,7 @@ related_links: {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="3.2.1"} +{: toc-version="3.3.0"} '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, SAP NetWeaver, and optionally for shared SAP files are deployed and preconfigured for SAP installation. The S/4HANA or BW/4HANA solution is installed based on the selected version. diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md index 7ba2a6f7..cad4c2f6 100644 --- a/solutions/e2e/README.md +++ b/solutions/e2e/README.md @@ -59,7 +59,7 @@ The end-to-end solution automates the following tasks: | Name | Source | Version | |------|--------|---------| -| [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.0.3 | +| [powervs\_infra](#module\_powervs\_infra) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 8.1.0 | | [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a | ### Resources diff --git a/solutions/e2e/main.tf b/solutions/e2e/main.tf index 7685b902..8f4383ba 100644 --- a/solutions/e2e/main.tf +++ b/solutions/e2e/main.tf @@ -7,7 +7,7 @@ module "powervs_infra" { source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone" - version = "8.0.3" + version = "8.1.0" providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi, ibm.ibm-sm = ibm.ibm-sm } diff --git a/solutions/e2e/provider.tf b/solutions/e2e/provider.tf index 81ea5a3e..ad53baf9 100644 --- a/solutions/e2e/provider.tf +++ b/solutions/e2e/provider.tf @@ -17,6 +17,7 @@ locals { "us-south" = "us-south" "dal10" = "us-south" "dal12" = "us-south" + "dal14" = "us-south" "us-east" = "us-east" "wdc06" = "us-east" "wdc07" = "us-east" @@ -40,6 +41,7 @@ locals { "us-south" = "us-south" "dal10" = "us-south" "dal12" = "us-south" + "dal14" = "us-south" "us-east" = "us-east" "wdc06" = "us-east" "wdc07" = "us-east" diff --git a/solutions/ibm-catalog/sap-ready-to-go/provider.tf b/solutions/ibm-catalog/sap-ready-to-go/provider.tf index 9132716c..911ae2be 100644 --- a/solutions/ibm-catalog/sap-ready-to-go/provider.tf +++ b/solutions/ibm-catalog/sap-ready-to-go/provider.tf @@ -17,6 +17,7 @@ locals { "us-south" = "us-south" "dal10" = "us-south" "dal12" = "us-south" + "dal14" = "us-south" "us-east" = "us-east" "wdc06" = "us-east" "wdc07" = "us-east" diff --git a/solutions/ibm-catalog/sap-s4hana-bw4hana/provider.tf b/solutions/ibm-catalog/sap-s4hana-bw4hana/provider.tf index 9132716c..911ae2be 100644 --- a/solutions/ibm-catalog/sap-s4hana-bw4hana/provider.tf +++ b/solutions/ibm-catalog/sap-s4hana-bw4hana/provider.tf @@ -17,6 +17,7 @@ locals { "us-south" = "us-south" "dal10" = "us-south" "dal12" = "us-south" + "dal14" = "us-south" "us-east" = "us-east" "wdc06" = "us-east" "wdc07" = "us-east" diff --git a/solutions/sap-ready-to-go/provider.tf b/solutions/sap-ready-to-go/provider.tf index 9132716c..911ae2be 100644 --- a/solutions/sap-ready-to-go/provider.tf +++ b/solutions/sap-ready-to-go/provider.tf @@ -17,6 +17,7 @@ locals { "us-south" = "us-south" "dal10" = "us-south" "dal12" = "us-south" + "dal14" = "us-south" "us-east" = "us-east" "wdc06" = "us-east" "wdc07" = "us-east"