Skip to content

Commit afe5476

Browse files
surajsbharadwajsurajsbharadwaj
authored
feat: Support dal14 and lon04 DC (#973)
* feat: Support mad04 DC for quickstart using P10
1 parent 0957db7 commit afe5476

File tree

12 files changed

+78
-34
lines changed

12 files changed

+78
-34
lines changed

‎ibm_catalog.json

+36
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@
8888
"displayname": "Dallas 12 (dal12)",
8989
"value": "dal12"
9090
},
91+
{
92+
"displayname": "Dallas 14 (dal14)",
93+
"value": "dal14"
94+
},
9195
{
9296
"displayname": "Frankfurt 1 (eu-de-1)",
9397
"value": "eu-de-1"
@@ -96,6 +100,10 @@
96100
"displayname": "Frankfurt 2 (eu-de-2)",
97101
"value": "eu-de-2"
98102
},
103+
{
104+
"displayname": "London 04 (lon04)",
105+
"value": "lon04"
106+
},
99107
{
100108
"displayname": "London 06 (lon06)",
101109
"value": "lon06"
@@ -564,6 +572,10 @@
564572
"displayname": "Dallas 12 (dal12)",
565573
"value": "dal12"
566574
},
575+
{
576+
"displayname": "Dallas 14 (dal14). P10 only(Custom profile required)",
577+
"value": "dal14"
578+
},
567579
{
568580
"displayname": "Frankfurt 1 (eu-de-1)",
569581
"value": "eu-de-1"
@@ -572,6 +584,10 @@
572584
"displayname": "Frankfurt 2 (eu-de-2)",
573585
"value": "eu-de-2"
574586
},
587+
{
588+
"displayname": "London 04 (lon04)",
589+
"value": "lon04"
590+
},
575591
{
576592
"displayname": "London 06 (lon06)",
577593
"value": "lon06"
@@ -580,6 +596,10 @@
580596
"displayname": "Madrid 02 (mad02)",
581597
"value": "mad02"
582598
},
599+
{
600+
"displayname": "Madrid 04 (mad04). P10 only(Custom profile required)",
601+
"value": "mad04"
602+
},
583603
{
584604
"displayname": "Osaka 21 (osa21)",
585605
"value": "osa21"
@@ -1197,6 +1217,10 @@
11971217
"displayname": "Dallas 12 (dal12)",
11981218
"value": "dal12"
11991219
},
1220+
{
1221+
"displayname": "Dallas 14 (dal14)",
1222+
"value": "dal14"
1223+
},
12001224
{
12011225
"displayname": "Frankfurt 1 (eu-de-1)",
12021226
"value": "eu-de-1"
@@ -1205,6 +1229,10 @@
12051229
"displayname": "Frankfurt 2 (eu-de-2)",
12061230
"value": "eu-de-2"
12071231
},
1232+
{
1233+
"displayname": "London 04 (lon04)",
1234+
"value": "lon04"
1235+
},
12081236
{
12091237
"displayname": "London 06 (lon06)",
12101238
"value": "lon06"
@@ -1518,6 +1546,10 @@
15181546
"displayname": "Dallas 12 (dal12)",
15191547
"value": "dal12"
15201548
},
1549+
{
1550+
"displayname": "Dallas 14 (dal14)",
1551+
"value": "dal14"
1552+
},
15211553
{
15221554
"displayname": "Frankfurt 1 (eu-de-1)",
15231555
"value": "eu-de-1"
@@ -1526,6 +1558,10 @@
15261558
"displayname": "Frankfurt 2 (eu-de-2)",
15271559
"value": "eu-de-2"
15281560
},
1561+
{
1562+
"displayname": "London 04 (lon04)",
1563+
"value": "lon04"
1564+
},
15291565
{
15301566
"displayname": "London 06 (lon06)",
15311567
"value": "lon06"

‎modules/powervs-vpc-landing-zone/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
110110
| <a name="module_configure_monitoring_host"></a> [configure\_monitoring\_host](#module\_configure\_monitoring\_host) | ./submodules/ansible | n/a |
111111
| <a name="module_configure_network_services"></a> [configure\_network\_services](#module\_configure\_network\_services) | ./submodules/ansible | n/a |
112112
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 6.4.4 |
113-
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 2.2.0 |
113+
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 2.3.0 |
114114
| <a name="module_private_secret_engine"></a> [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.3.4 |
115115
| <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.2.2 |
116116
| <a name="module_secrets_manager_private_certificate"></a> [secrets\_manager\_private\_certificate](#module\_secrets\_manager\_private\_certificate) | terraform-ibm-modules/secrets-manager-private-cert/ibm | 1.3.2 |

‎modules/powervs-vpc-landing-zone/locals.tf

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ locals {
2121
"us-south" = "us-south"
2222
"dal10" = "us-south"
2323
"dal12" = "us-south"
24+
"dal14" = "us-south"
2425
"us-east" = "us-east"
2526
"wdc06" = "us-east"
2627
"wdc07" = "us-east"

‎modules/powervs-vpc-landing-zone/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ locals {
8181

8282
module "powervs_workspace" {
8383
source = "terraform-ibm-modules/powervs-workspace/ibm"
84-
version = "2.2.0"
84+
version = "2.3.0"
8585
providers = { ibm = ibm.ibm-pi }
8686

8787
pi_zone = var.powervs_zone

‎reference-architectures/import/deploy-arch-ibm-pvs-inf-import.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-12-11"
4+
lastupdated: "2024-12-13"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ use-case: ITServiceManagement
1515
industry: Technology
1616
compliance:
1717
content-type: reference-architecture
18-
version: v8.0.3
18+
version: v8.1.0
1919

2020
---
2121

@@ -26,7 +26,7 @@ version: v8.0.3
2626
{: toc-industry="Technology"}
2727
{: toc-use-case="ITServiceManagement"}
2828
{: toc-compliance="SAPCertified"}
29-
{: toc-version="8.0.3"}
29+
{: toc-version="8.1.0"}
3030

3131
This solution helps to install the deployable architecture ['Power Virtual Server for SAP HANA'](https://cloud.ibm.com/catalog/architecture/deploy-arch-ibm-pvs-sap-9aa6135e-75d5-467e-9f4a-ac2a21c069b8-global) on top of a pre-existing Power Virtual Server(PowerVS) landscape. 'Power Virtual Server for SAP HANA' automation requires a schematics workspace id for installation. The 'Import' solution creates a schematics workspace by taking pre-existing VPC and PowerVS infrastructure resource details as inputs. The ID of this schematics workspace will be the pre-requisite workspace id required by 'Power Virtual Server for SAP HANA' to create and configure the PowerVS instances for SAP on top of the existing infrastructure.
3232

‎reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-12-11"
4+
lastupdated: "2024-12-13"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.0.3
18+
version: v8.1.0
1919
compliance: SAPCertified
2020

2121
---
@@ -28,7 +28,7 @@ compliance: SAPCertified
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance="SAPCertified"}
31-
{: toc-version="8.0.3"}
31+
{: toc-version="8.1.0"}
3232

3333
The Power Virtual Server with VPC landing zone as variation 'Extend Power Virtual Server with VPC landing zone' creates an additional Power Virtual Server workspace and connects it with the already created Power Virtual Server with VPC landing zone. It builds on the existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'.
3434

‎reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-12-11"
4+
lastupdated: "2024-12-13"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.0.3
18+
version: v8.1.0
1919
compliance:
2020

2121
---
@@ -28,7 +28,7 @@ compliance:
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance=""}
31-
{: toc-version="8.0.3"}
31+
{: toc-version="8.1.0"}
3232

3333
Quickstart deployment of the Power Virtual Server with VPC landing zone creates VPC services, a Power Virtual Server workspace, and interconnects them. It also deploys a Power Virtual Server of chosen T-shirt size or custom configuration. Supported Os are Aix, IBM i, and Linux images.
3434

‎reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-12-11"
4+
lastupdated: "2024-12-13"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1515
use-case: ITServiceManagement
1616
industry: Technology
1717
content-type: reference-architecture
18-
version: v8.0.3
18+
version: v8.1.0
1919
compliance: SAPCertified
2020

2121
---
@@ -28,7 +28,7 @@ compliance: SAPCertified
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance="SAPCertified"}
31-
{: toc-version="8.0.3"}
31+
{: toc-version="8.1.0"}
3232

3333
The Standard deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them.
3434

‎solutions/import/provider.tf

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ locals {
1717
"us-south" = "us-south"
1818
"dal10" = "us-south"
1919
"dal12" = "us-south"
20+
"dal14" = "us-south"
2021
"us-east" = "us-east"
2122
"wdc06" = "us-east"
2223
"wdc07" = "us-east"
@@ -40,6 +41,7 @@ locals {
4041
"us-south" = "us-south"
4142
"dal10" = "us-south"
4243
"dal12" = "us-south"
44+
"dal14" = "us-south"
4345
"us-east" = "us-east"
4446
"wdc06" = "us-east"
4547
"wdc07" = "us-east"

‎solutions/standard-extend/provider.tf

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ locals {
1717
"us-south" = "us-south"
1818
"dal10" = "us-south"
1919
"dal12" = "us-south"
20+
"dal14" = "us-south"
2021
"us-east" = "us-east"
2122
"wdc06" = "us-east"
2223
"wdc07" = "us-east"

‎solutions/standard-plus-vsi/provider.tf

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,47 @@
11
locals {
22
ibm_powervs_zone_region_map = {
3-
"syd04" = "syd"
4-
"syd05" = "syd"
5-
"sao01" = "sao"
6-
"sao04" = "sao"
7-
"tor01" = "tor"
8-
"mon01" = "mon"
9-
"eu-de-1" = "eu-de"
10-
"eu-de-2" = "eu-de"
11-
"mad02" = "mad"
12-
#"mad04" = "mad" #not supported. Just P10 machines
3+
"syd04" = "syd"
4+
"syd05" = "syd"
5+
"sao01" = "sao"
6+
"sao04" = "sao"
7+
"tor01" = "tor"
8+
"mon01" = "mon"
9+
"eu-de-1" = "eu-de"
10+
"eu-de-2" = "eu-de"
11+
"mad02" = "mad"
12+
"mad04" = "mad"
1313
"lon04" = "lon"
1414
"lon06" = "lon"
1515
"osa21" = "osa"
1616
"tok04" = "tok"
1717
"us-south" = "us-south"
1818
"dal10" = "us-south"
1919
"dal12" = "us-south"
20+
"dal14" = "us-south"
2021
"us-east" = "us-east"
2122
"wdc06" = "us-east"
2223
"wdc07" = "us-east"
2324
}
2425

2526
ibm_powervs_zone_cloud_region_map = {
26-
"syd04" = "au-syd"
27-
"syd05" = "au-syd"
28-
"sao01" = "br-sao"
29-
"sao04" = "br-sao"
30-
"tor01" = "ca-tor"
31-
"mon01" = "ca-tor"
32-
"eu-de-1" = "eu-de"
33-
"eu-de-2" = "eu-de"
34-
"mad02" = "eu-es"
35-
#"mad04" = "eu-es" #not supported. Just P10 machines
27+
"syd04" = "au-syd"
28+
"syd05" = "au-syd"
29+
"sao01" = "br-sao"
30+
"sao04" = "br-sao"
31+
"tor01" = "ca-tor"
32+
"mon01" = "ca-tor"
33+
"eu-de-1" = "eu-de"
34+
"eu-de-2" = "eu-de"
35+
"mad02" = "eu-es"
36+
"mad04" = "eu-es"
3637
"lon04" = "eu-gb"
3738
"lon06" = "eu-gb"
3839
"osa21" = "jp-osa"
3940
"tok04" = "jp-tok"
4041
"us-south" = "us-south"
4142
"dal10" = "us-south"
4243
"dal12" = "us-south"
44+
"dal14" = "us-south"
4345
"us-east" = "us-east"
4446
"wdc06" = "us-east"
4547
"wdc07" = "us-east"

‎solutions/standard/provider.tf

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ locals {
1717
"us-south" = "us-south"
1818
"dal10" = "us-south"
1919
"dal12" = "us-south"
20+
"dal14" = "us-south"
2021
"us-east" = "us-east"
2122
"wdc06" = "us-east"
2223
"wdc07" = "us-east"
@@ -40,6 +41,7 @@ locals {
4041
"us-south" = "us-south"
4142
"dal10" = "us-south"
4243
"dal12" = "us-south"
44+
"dal14" = "us-south"
4345
"us-east" = "us-east"
4446
"wdc06" = "us-east"
4547
"wdc07" = "us-east"

0 commit comments

Comments
 (0)