feat: switch eu-de-1 to PER and update PER DC list to include sao04, …

…wdc07, mad02, eu-de-1, eu-de-2 and mad04. (#589)
terraform-ibm-modules · Jan 11, 2024 · d3b8daa · d3b8daa
1 parent 61a40ed
commit d3b8daa
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 42 deletions.
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -29,7 +29,8 @@
                 "secure",
                 "server",
                 "networking",
-                "workspace"
+                "workspace",
+                "hana"
             ],
             "short_description": "Deploy SAP systems on Power Virtual Server with VPC landing zone",
             "long_description": "This deployable architecture is designed to assist you in deploying SAP ERP software landscapes into IBM Cloud on the IBM Power Virtual Server infrastructure. This is the second step in the deployment process for creating a full environment. Before starting this step, you should first deploy 'Power Virtual Server with VPC landing zone'. Once this is completed, you are prepared to start this step.\n\nSAP on Power Virtual Server creates and prepares Power Virtual Server instances for SAP HANA and SAP NetWeaver workloads. After deployment completes, you may (depending on the framework you chose) begin installing SAP on the configured instances or login to your newly created SAP instances directly.",
@@ -94,11 +95,11 @@
                                     "value": "dal12"
                                 },
                                 {
-                                    "displayname": "Frankfurt 1 (eu-de-1)",
+                                    "displayname": "Frankfurt 1 (eu-de-1) PER",
                                     "value": "eu-de-1"
                                 },
                                 {
-                                    "displayname": "Frankfurt 2 (eu-de-2)",
+                                    "displayname": "Frankfurt 2 (eu-de-2) PER",
                                     "value": "eu-de-2"
                                 },
                                 {
@@ -121,6 +122,10 @@
                                     "displayname": "Sao Paulo 01 (sao01)",
                                     "value": "sao01"
                                 },
+                                {
+                                    "displayname": "Sao Paulo 04 (sao04)",
+                                    "value": "sao04"
+                                },
                                 {
                                     "displayname": "Sydney 04 (syd04)",
                                     "value": "syd04"
@@ -144,6 +149,10 @@
                                 {
                                     "displayname": "Washington DC 06 (wdc06) PER",
                                     "value": "wdc06"
+                                },
+                                {
+                                    "displayname": "Washington DC 07 (wdc07) PER",
+                                    "value": "wdc07"
                                 }
                             ],
                             "custom_config": {}
@@ -401,11 +410,11 @@
                                     "value": "dal12"
                                 },
                                 {
-                                    "displayname": "Frankfurt 1 (eu-de-1)",
+                                    "displayname": "Frankfurt 1 (eu-de-1) PER",
                                     "value": "eu-de-1"
                                 },
                                 {
-                                    "displayname": "Frankfurt 2 (eu-de-2)",
+                                    "displayname": "Frankfurt 2 (eu-de-2) PER",
                                     "value": "eu-de-2"
                                 },
                                 {
@@ -428,6 +437,10 @@
                                     "displayname": "Sao Paulo 01 (sao01)",
                                     "value": "sao01"
                                 },
+                                {
+                                    "displayname": "Sao Paulo 04 (sao04) PER",
+                                    "value": "sao04"
+                                },
                                 {
                                     "displayname": "Sydney 04 (syd04)",
                                     "value": "syd04"
@@ -451,6 +464,10 @@
                                 {
                                     "displayname": "Washington DC 06 (wdc06) PER",
                                     "value": "wdc06"
+                                },
+                                {
+                                    "displayname": "Washington DC 07 (wdc07) PER",
+                                    "value": "wdc07"
                                 }
                             ],
                             "custom_config": {}

diff --git a/modules/pi-sap-system-type1/README.md b/modules/pi-sap-system-type1/README.md
@@ -34,7 +34,7 @@ The Power Virtual Server for SAP module automates the following tasks:
 | <a name="module_ansible_netweaver_sapmnt_mount"></a> [ansible\_netweaver\_sapmnt\_mount](#module\_ansible\_netweaver\_sapmnt\_mount) | ../remote-exec-ansible | n/a |
 | <a name="module_ansible_sap_instance_init"></a> [ansible\_sap\_instance\_init](#module\_ansible\_sap\_instance\_init) | ../remote-exec-ansible | n/a |
 | <a name="module_ansible_sharefs_instance_exportfs"></a> [ansible\_sharefs\_instance\_exportfs](#module\_ansible\_sharefs\_instance\_exportfs) | ../remote-exec-ansible | n/a |
-| <a name="module_pi_attach_sap_network"></a> [pi\_attach\_sap\_network](#module\_pi\_attach\_sap\_network) | terraform-ibm-modules/powervs-workspace/ibm//modules/pi-cloudconnection-attach | 1.2.0 |
+| <a name="module_pi_attach_sap_network"></a> [pi\_attach\_sap\_network](#module\_pi\_attach\_sap\_network) | terraform-ibm-modules/powervs-workspace/ibm//modules/pi-cloudconnection-attach | 1.5.0 |
 | <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 1.0.2 |
 | <a name="module_pi_hana_storage_calculation"></a> [pi\_hana\_storage\_calculation](#module\_pi\_hana\_storage\_calculation) | ../pi-hana-storage-config | n/a |
 | <a name="module_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#module\_pi\_netweaver\_instance) | terraform-ibm-modules/powervs-instance/ibm | 1.0.2 |

diff --git a/modules/pi-sap-system-type1/main.tf b/modules/pi-sap-system-type1/main.tf
@@ -15,13 +15,13 @@ resource "ibm_pi_network" "sap_network" {
 #####################################################
 
 locals {
-  per_enabled_dc_list = ["dal10", "wdc06"]
+  per_enabled_dc_list = ["dal10", "wdc06", "wdc07", "mad02", "mad04", "eu-de-1", "eu-de-2", "sao04"]
   per_enabled         = contains(local.per_enabled_dc_list, var.pi_zone)
 }
 
 module "pi_attach_sap_network" {
   source  = "terraform-ibm-modules/powervs-workspace/ibm//modules/pi-cloudconnection-attach"
-  version = "1.2.1"
+  version = "1.5.0"
   count   = local.per_enabled ? 0 : 1
 
   pi_workspace_guid         = var.pi_workspace_guid

diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md
@@ -58,7 +58,7 @@ The end to end solution automates the following tasks:
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 4.0.1 |
+| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 4.2.0 |
 | <a name="module_sap_system"></a> [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
@@ -7,7 +7,7 @@
 
 module "fullstack" {
   source  = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
-  version = "4.0.1"
+  version = "4.2.0"
 
   providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi }
 

diff --git a/solutions/e2e/provider.tf b/solutions/e2e/provider.tf
@@ -1,40 +1,48 @@
 locals {
   ibm_powervs_zone_region_map = {
-    "lon04"    = "lon"
-    "lon06"    = "lon"
-    "eu-de-1"  = "eu-de"
-    "eu-de-2"  = "eu-de"
+    "syd04"    = "syd"
+    "syd05"    = "syd"
+    "sao01"    = "sao"
+    "sao04"    = "sao"
     "tor01"    = "tor"
     "mon01"    = "mon"
+    "eu-de-1"  = "eu-de"
+    "eu-de-2"  = "eu-de"
+    "mad02"    = "mad"
+    "mad04"    = "mad"
+    "lon04"    = "lon"
+    "lon06"    = "lon"
     "osa21"    = "osa"
     "tok04"    = "tok"
-    "syd04"    = "syd"
-    "syd05"    = "syd"
-    "sao01"    = "sao"
     "us-south" = "us-south"
     "dal10"    = "us-south"
     "dal12"    = "us-south"
     "us-east"  = "us-east"
     "wdc06"    = "us-east"
+    "wdc07"    = "us-east"
   }
 
   ibm_powervs_zone_cloud_region_map = {
     "syd04"    = "au-syd"
     "syd05"    = "au-syd"
+    "sao01"    = "br-sao"
+    "sao04"    = "br-sao"
+    "tor01"    = "ca-tor"
+    "mon01"    = "ca-tor"
     "eu-de-1"  = "eu-de"
     "eu-de-2"  = "eu-de"
+    "mad02"    = "eu-es"
+    "mad04"    = "eu-es"
     "lon04"    = "eu-gb"
     "lon06"    = "eu-gb"
-    "tok04"    = "jp-tok"
-    "tor01"    = "ca-tor"
     "osa21"    = "jp-osa"
-    "sao01"    = "br-sao"
-    "mon01"    = "ca-tor"
+    "tok04"    = "jp-tok"
     "us-south" = "us-south"
     "dal10"    = "us-south"
     "dal12"    = "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
@@ -1,21 +1,25 @@
 locals {
   ibm_powervs_zone_region_map = {
-    "lon04"    = "lon"
-    "lon06"    = "lon"
-    "eu-de-1"  = "eu-de"
-    "eu-de-2"  = "eu-de"
+    "syd04"    = "syd"
+    "syd05"    = "syd"
+    "sao01"    = "sao"
+    "sao04"    = "sao"
     "tor01"    = "tor"
     "mon01"    = "mon"
+    "eu-de-1"  = "eu-de"
+    "eu-de-2"  = "eu-de"
+    "mad02"    = "mad"
+    "mad04"    = "mad"
+    "lon04"    = "lon"
+    "lon06"    = "lon"
     "osa21"    = "osa"
     "tok04"    = "tok"
-    "syd04"    = "syd"
-    "syd05"    = "syd"
-    "sao01"    = "sao"
     "us-south" = "us-south"
     "dal10"    = "us-south"
     "dal12"    = "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
@@ -1,21 +1,25 @@
 locals {
   ibm_powervs_zone_region_map = {
-    "lon04"    = "lon"
-    "lon06"    = "lon"
-    "eu-de-1"  = "eu-de"
-    "eu-de-2"  = "eu-de"
+    "syd04"    = "syd"
+    "syd05"    = "syd"
+    "sao01"    = "sao"
+    "sao04"    = "sao"
     "tor01"    = "tor"
     "mon01"    = "mon"
+    "eu-de-1"  = "eu-de"
+    "eu-de-2"  = "eu-de"
+    "mad02"    = "mad"
+    "mad04"    = "mad"
+    "lon04"    = "lon"
+    "lon06"    = "lon"
     "osa21"    = "osa"
     "tok04"    = "tok"
-    "syd04"    = "syd"
-    "syd05"    = "syd"
-    "sao01"    = "sao"
     "us-south" = "us-south"
     "dal10"    = "us-south"
     "dal12"    = "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
@@ -1,21 +1,25 @@
 locals {
   ibm_powervs_zone_region_map = {
-    "lon04"    = "lon"
-    "lon06"    = "lon"
-    "eu-de-1"  = "eu-de"
-    "eu-de-2"  = "eu-de"
+    "syd04"    = "syd"
+    "syd05"    = "syd"
+    "sao01"    = "sao"
+    "sao04"    = "sao"
     "tor01"    = "tor"
     "mon01"    = "mon"
+    "eu-de-1"  = "eu-de"
+    "eu-de-2"  = "eu-de"
+    "mad02"    = "mad"
+    "mad04"    = "mad"
+    "lon04"    = "lon"
+    "lon06"    = "lon"
     "osa21"    = "osa"
     "tok04"    = "tok"
-    "syd04"    = "syd"
-    "syd05"    = "syd"
-    "sao01"    = "sao"
     "us-south" = "us-south"
     "dal10"    = "us-south"
     "dal12"    = "us-south"
     "us-east"  = "us-east"
     "wdc06"    = "us-east"
+    "wdc07"    = "us-east"
   }
 }