Skip to content

Commit d3b8daa

Browse files
surajsbharadwajsurajsbharadwaj
authored
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)
1 parent 61a40ed commit d3b8daa

File tree

9 files changed

+79
-42
lines changed

9 files changed

+79
-42
lines changed

‎ibm_catalog.json‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"secure",
3030
"server",
3131
"networking",
32-
"workspace"
32+
"workspace",
33+
"hana"
3334
],
3435
"short_description": "Deploy SAP systems on Power Virtual Server with VPC landing zone",
3536
"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 @@
9495
"value": "dal12"
9596
},
9697
{
97-
"displayname": "Frankfurt 1 (eu-de-1)",
98+
"displayname": "Frankfurt 1 (eu-de-1) PER",
9899
"value": "eu-de-1"
99100
},
100101
{
101-
"displayname": "Frankfurt 2 (eu-de-2)",
102+
"displayname": "Frankfurt 2 (eu-de-2) PER",
102103
"value": "eu-de-2"
103104
},
104105
{
@@ -121,6 +122,10 @@
121122
"displayname": "Sao Paulo 01 (sao01)",
122123
"value": "sao01"
123124
},
125+
{
126+
"displayname": "Sao Paulo 04 (sao04)",
127+
"value": "sao04"
128+
},
124129
{
125130
"displayname": "Sydney 04 (syd04)",
126131
"value": "syd04"
@@ -144,6 +149,10 @@
144149
{
145150
"displayname": "Washington DC 06 (wdc06) PER",
146151
"value": "wdc06"
152+
},
153+
{
154+
"displayname": "Washington DC 07 (wdc07) PER",
155+
"value": "wdc07"
147156
}
148157
],
149158
"custom_config": {}
@@ -401,11 +410,11 @@
401410
"value": "dal12"
402411
},
403412
{
404-
"displayname": "Frankfurt 1 (eu-de-1)",
413+
"displayname": "Frankfurt 1 (eu-de-1) PER",
405414
"value": "eu-de-1"
406415
},
407416
{
408-
"displayname": "Frankfurt 2 (eu-de-2)",
417+
"displayname": "Frankfurt 2 (eu-de-2) PER",
409418
"value": "eu-de-2"
410419
},
411420
{
@@ -428,6 +437,10 @@
428437
"displayname": "Sao Paulo 01 (sao01)",
429438
"value": "sao01"
430439
},
440+
{
441+
"displayname": "Sao Paulo 04 (sao04) PER",
442+
"value": "sao04"
443+
},
431444
{
432445
"displayname": "Sydney 04 (syd04)",
433446
"value": "syd04"
@@ -451,6 +464,10 @@
451464
{
452465
"displayname": "Washington DC 06 (wdc06) PER",
453466
"value": "wdc06"
467+
},
468+
{
469+
"displayname": "Washington DC 07 (wdc07) PER",
470+
"value": "wdc07"
454471
}
455472
],
456473
"custom_config": {}

‎modules/pi-sap-system-type1/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The Power Virtual Server for SAP module automates the following tasks:
3434
| <a name="module_ansible_netweaver_sapmnt_mount"></a> [ansible\_netweaver\_sapmnt\_mount](#module\_ansible\_netweaver\_sapmnt\_mount) | ../remote-exec-ansible | n/a |
3535
| <a name="module_ansible_sap_instance_init"></a> [ansible\_sap\_instance\_init](#module\_ansible\_sap\_instance\_init) | ../remote-exec-ansible | n/a |
3636
| <a name="module_ansible_sharefs_instance_exportfs"></a> [ansible\_sharefs\_instance\_exportfs](#module\_ansible\_sharefs\_instance\_exportfs) | ../remote-exec-ansible | n/a |
37-
| <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 |
37+
| <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 |
3838
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 1.0.2 |
3939
| <a name="module_pi_hana_storage_calculation"></a> [pi\_hana\_storage\_calculation](#module\_pi\_hana\_storage\_calculation) | ../pi-hana-storage-config | n/a |
4040
| <a name="module_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#module\_pi\_netweaver\_instance) | terraform-ibm-modules/powervs-instance/ibm | 1.0.2 |

‎modules/pi-sap-system-type1/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ resource "ibm_pi_network" "sap_network" {
1515
#####################################################
1616

1717
locals {
18-
per_enabled_dc_list = ["dal10", "wdc06"]
18+
per_enabled_dc_list = ["dal10", "wdc06", "wdc07", "mad02", "mad04", "eu-de-1", "eu-de-2", "sao04"]
1919
per_enabled = contains(local.per_enabled_dc_list, var.pi_zone)
2020
}
2121

2222
module "pi_attach_sap_network" {
2323
source = "terraform-ibm-modules/powervs-workspace/ibm//modules/pi-cloudconnection-attach"
24-
version = "1.2.1"
24+
version = "1.5.0"
2525
count = local.per_enabled ? 0 : 1
2626

2727
pi_workspace_guid = var.pi_workspace_guid

‎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.0.1 |
61+
| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 4.2.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.0.1"
10+
version = "4.2.0"
1111

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

‎solutions/e2e/provider.tf‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,48 @@
11
locals {
22
ibm_powervs_zone_region_map = {
3-
"lon04" = "lon"
4-
"lon06" = "lon"
5-
"eu-de-1" = "eu-de"
6-
"eu-de-2" = "eu-de"
3+
"syd04" = "syd"
4+
"syd05" = "syd"
5+
"sao01" = "sao"
6+
"sao04" = "sao"
77
"tor01" = "tor"
88
"mon01" = "mon"
9+
"eu-de-1" = "eu-de"
10+
"eu-de-2" = "eu-de"
11+
"mad02" = "mad"
12+
"mad04" = "mad"
13+
"lon04" = "lon"
14+
"lon06" = "lon"
915
"osa21" = "osa"
1016
"tok04" = "tok"
11-
"syd04" = "syd"
12-
"syd05" = "syd"
13-
"sao01" = "sao"
1417
"us-south" = "us-south"
1518
"dal10" = "us-south"
1619
"dal12" = "us-south"
1720
"us-east" = "us-east"
1821
"wdc06" = "us-east"
22+
"wdc07" = "us-east"
1923
}
2024

2125
ibm_powervs_zone_cloud_region_map = {
2226
"syd04" = "au-syd"
2327
"syd05" = "au-syd"
28+
"sao01" = "br-sao"
29+
"sao04" = "br-sao"
30+
"tor01" = "ca-tor"
31+
"mon01" = "ca-tor"
2432
"eu-de-1" = "eu-de"
2533
"eu-de-2" = "eu-de"
34+
"mad02" = "eu-es"
35+
"mad04" = "eu-es"
2636
"lon04" = "eu-gb"
2737
"lon06" = "eu-gb"
28-
"tok04" = "jp-tok"
29-
"tor01" = "ca-tor"
3038
"osa21" = "jp-osa"
31-
"sao01" = "br-sao"
32-
"mon01" = "ca-tor"
39+
"tok04" = "jp-tok"
3340
"us-south" = "us-south"
3441
"dal10" = "us-south"
3542
"dal12" = "us-south"
3643
"us-east" = "us-east"
3744
"wdc06" = "us-east"
45+
"wdc07" = "us-east"
3846
}
3947
}
4048

‎solutions/ibm-catalog/sap-ready-to-go/provider.tf‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
locals {
22
ibm_powervs_zone_region_map = {
3-
"lon04" = "lon"
4-
"lon06" = "lon"
5-
"eu-de-1" = "eu-de"
6-
"eu-de-2" = "eu-de"
3+
"syd04" = "syd"
4+
"syd05" = "syd"
5+
"sao01" = "sao"
6+
"sao04" = "sao"
77
"tor01" = "tor"
88
"mon01" = "mon"
9+
"eu-de-1" = "eu-de"
10+
"eu-de-2" = "eu-de"
11+
"mad02" = "mad"
12+
"mad04" = "mad"
13+
"lon04" = "lon"
14+
"lon06" = "lon"
915
"osa21" = "osa"
1016
"tok04" = "tok"
11-
"syd04" = "syd"
12-
"syd05" = "syd"
13-
"sao01" = "sao"
1417
"us-south" = "us-south"
1518
"dal10" = "us-south"
1619
"dal12" = "us-south"
1720
"us-east" = "us-east"
1821
"wdc06" = "us-east"
22+
"wdc07" = "us-east"
1923
}
2024
}
2125

‎solutions/ibm-catalog/sap-s4hana-bw4hana/provider.tf‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
locals {
22
ibm_powervs_zone_region_map = {
3-
"lon04" = "lon"
4-
"lon06" = "lon"
5-
"eu-de-1" = "eu-de"
6-
"eu-de-2" = "eu-de"
3+
"syd04" = "syd"
4+
"syd05" = "syd"
5+
"sao01" = "sao"
6+
"sao04" = "sao"
77
"tor01" = "tor"
88
"mon01" = "mon"
9+
"eu-de-1" = "eu-de"
10+
"eu-de-2" = "eu-de"
11+
"mad02" = "mad"
12+
"mad04" = "mad"
13+
"lon04" = "lon"
14+
"lon06" = "lon"
915
"osa21" = "osa"
1016
"tok04" = "tok"
11-
"syd04" = "syd"
12-
"syd05" = "syd"
13-
"sao01" = "sao"
1417
"us-south" = "us-south"
1518
"dal10" = "us-south"
1619
"dal12" = "us-south"
1720
"us-east" = "us-east"
1821
"wdc06" = "us-east"
22+
"wdc07" = "us-east"
1923
}
2024
}
2125

‎solutions/sap-ready-to-go/provider.tf‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
locals {
22
ibm_powervs_zone_region_map = {
3-
"lon04" = "lon"
4-
"lon06" = "lon"
5-
"eu-de-1" = "eu-de"
6-
"eu-de-2" = "eu-de"
3+
"syd04" = "syd"
4+
"syd05" = "syd"
5+
"sao01" = "sao"
6+
"sao04" = "sao"
77
"tor01" = "tor"
88
"mon01" = "mon"
9+
"eu-de-1" = "eu-de"
10+
"eu-de-2" = "eu-de"
11+
"mad02" = "mad"
12+
"mad04" = "mad"
13+
"lon04" = "lon"
14+
"lon06" = "lon"
915
"osa21" = "osa"
1016
"tok04" = "tok"
11-
"syd04" = "syd"
12-
"syd05" = "syd"
13-
"sao01" = "sao"
1417
"us-south" = "us-south"
1518
"dal10" = "us-south"
1619
"dal12" = "us-south"
1720
"us-east" = "us-east"
1821
"wdc06" = "us-east"
22+
"wdc07" = "us-east"
1923
}
2024
}
2125

0 commit comments

Comments
 (0)