feat: dal12 PER support (#607)

stafaniasaju · surajsbharadwaj · web-flow · commit 87db0bf3889d · 2024-02-01T17:30:04.000+01:00
---------

Co-authored-by: surajsbharadwaj &lt;suraj.bharadwaj@ibm.com&gt;
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -91,7 +91,7 @@
                                     "value": "dal10"
                                 },
                                 {
-                                    "displayname": "Dallas 12 (dal12)",
+                                    "displayname": "Dallas 12 (dal12) PER",
                                     "value": "dal12"
                                 },
                                 {
@@ -406,7 +406,7 @@
                                     "value": "dal10"
                                 },
                                 {
-                                    "displayname": "Dallas 12 (dal12)",
+                                    "displayname": "Dallas 12 (dal12) PER",
                                     "value": "dal12"
                                 },
                                 {
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.5.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.6.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", "wdc07", "mad02", "mad04", "eu-de-1", "eu-de-2", "sao04"]
+  per_enabled_dc_list = ["dal10", "dal12", "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.5.0"
+  version = "1.6.0"
   count   = local.per_enabled ? 0 : 1
 
   pi_workspace_guid         = var.pi_workspace_guid
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
@@ -2,7 +2,7 @@
 
 copyright:
   years: 2024
-lastupdated: "2024-01-30"
+lastupdated: "2024-02-01"
 
 keywords:
 
@@ -12,7 +12,7 @@ authors:
   - name: Arnold Beilmann
   - name: Suraj Bharadwaj
 
-version: v1.6.1
+version: v1.7.0
 
 # Whether the reference architecture is published to Cloud Docs production.
 # When set to false, the file is available only in staging. Default is false.
@@ -53,7 +53,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="1.6.1"}
+{: toc-version="1.7.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
@@ -2,7 +2,7 @@
 
 copyright:
   years: 2024
-lastupdated: "2024-01-30"
+lastupdated: "2024-02-01"
 
 keywords:
 
@@ -12,7 +12,7 @@ authors:
   - name: Arnold Beilmann
   - name: Suraj Bharadwaj
 
-version: v1.6.1
+version: v1.7.0
 
 # Whether the reference architecture is published to Cloud Docs production.
 # When set to false, the file is available only in staging. Default is false.
@@ -53,7 +53,7 @@ content-type: reference-architecture
 {: toc-industry="Technology"}
 {: toc-use-case="ITServiceManagement"}
 {: toc-compliance="SAPCertified"}
-{: toc-version="1.6.1"}
+{: toc-version="1.7.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
@@ -58,14 +58,14 @@ 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.3.0 |
+| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 4.4.0 |
 | <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
 
 ### Resources
 
 | Name | Type |
 |------|------|
-| [time_sleep.wait_5_mins](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
+| [time_sleep.wait_10_mins](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource |
 
 ### Inputs
 
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.3.0"
+  version = "4.4.0"
 
   providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi }
 
@@ -23,8 +23,8 @@ module "fullstack" {
   configure_nfs_server        = var.configure_nfs_server
 }
 
-resource "time_sleep" "wait_5_mins" {
-  create_duration = "300s"
+resource "time_sleep" "wait_10_mins" {
+  create_duration = "600s"
 }
 #######################################################
 # Power Virtual Server SAP ready-to-go
@@ -62,7 +62,7 @@ locals {
 
 module "sap_system" {
   source     = "../../modules/pi-sap-system-type1"
-  depends_on = [time_sleep.wait_5_mins]
+  depends_on = [time_sleep.wait_10_mins]
   providers  = { ibm = ibm.ibm-pi }
 
   pi_zone                                = var.powervs_zone

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`"value": "dal10"`
`92`	`92`	`},`
`93`	`93`	`{`
`94`		`- "displayname": "Dallas 12 (dal12)",`
	`94`	`+ "displayname": "Dallas 12 (dal12) PER",`
`95`	`95`	`"value": "dal12"`
`96`	`96`	`},`
`97`	`97`	`{`
`@@ -406,7 +406,7 @@`
`406`	`406`	`"value": "dal10"`
`407`	`407`	`},`
`408`	`408`	`{`
`409`		`- "displayname": "Dallas 12 (dal12)",`
	`409`	`+ "displayname": "Dallas 12 (dal12) PER",`
`410`	`410`	`"value": "dal12"`
`411`	`411`	`},`
`412`	`412`	`{`