Skip to content

Commit 5486921

Browse files
surajsbharadwajsurajsbharadwaj
authored
fix: provider for vpn and dropdown config in json (#843)
1 parent 7918cc6 commit 5486921

File tree

7 files changed

+103
-27
lines changed

7 files changed

+103
-27
lines changed

‎ibm_catalog.json‎

Lines changed: 88 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,51 @@
256256
},
257257
{
258258
"key": "existing_sm_instance_region",
259-
"custom_config": {
260-
"config_constraints": {
261-
"generationType": "2"
259+
"type": "string",
260+
"default_value": "null",
261+
"options": [
262+
{
263+
"displayname": "Null",
264+
"value": "null"
262265
},
263-
"grouping": "deployment",
264-
"original_grouping": "deployment",
265-
"type": "vpc_region"
266-
}
266+
{
267+
"displayname": "au-syd",
268+
"value": "au-syd"
269+
},
270+
{
271+
"displayname": "br-sao",
272+
"value": "br-sao"
273+
},
274+
{
275+
"displayname": "ca-tor",
276+
"value": "ca-tor"
277+
},
278+
{
279+
"displayname": "eu-de",
280+
"value": "eu-es"
281+
},
282+
{
283+
"displayname": "eu-gb",
284+
"value": "eu-gb"
285+
},
286+
{
287+
"displayname": "jp-osa",
288+
"value": "jp-osa"
289+
},
290+
{
291+
"displayname": "jp-tok",
292+
"value": "jp-tok"
293+
},
294+
{
295+
"displayname": "us-east",
296+
"value": "us-east"
297+
},
298+
{
299+
"displayname": "us-south",
300+
"value": "us-south"
301+
}
302+
],
303+
"custom_config": {}
267304
},
268305
{
269306
"key": "certificate_template_name"
@@ -782,14 +819,51 @@
782819
},
783820
{
784821
"key": "existing_sm_instance_region",
785-
"custom_config": {
786-
"config_constraints": {
787-
"generationType": "2"
822+
"type": "string",
823+
"default_value": "null",
824+
"options": [
825+
{
826+
"displayname": "Null",
827+
"value": "null"
788828
},
789-
"grouping": "deployment",
790-
"original_grouping": "deployment",
791-
"type": "vpc_region"
792-
}
829+
{
830+
"displayname": "au-syd",
831+
"value": "au-syd"
832+
},
833+
{
834+
"displayname": "br-sao",
835+
"value": "br-sao"
836+
},
837+
{
838+
"displayname": "ca-tor",
839+
"value": "ca-tor"
840+
},
841+
{
842+
"displayname": "eu-de",
843+
"value": "eu-es"
844+
},
845+
{
846+
"displayname": "eu-gb",
847+
"value": "eu-gb"
848+
},
849+
{
850+
"displayname": "jp-osa",
851+
"value": "jp-osa"
852+
},
853+
{
854+
"displayname": "jp-tok",
855+
"value": "jp-tok"
856+
},
857+
{
858+
"displayname": "us-east",
859+
"value": "us-east"
860+
},
861+
{
862+
"displayname": "us-south",
863+
"value": "us-south"
864+
}
865+
],
866+
"custom_config": {}
793867
},
794868
{
795869
"key": "certificate_template_name"

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-05-21"
4+
lastupdated: "2024-05-24"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ use-case: ITServiceManagement
1515
industry: Technology
1616
compliance: SAPCertified
1717
content-type: reference-architecture
18-
version: v5.0.1
18+
version: v5.1.1
1919

2020
---
2121

@@ -27,13 +27,15 @@ version: v5.0.1
2727
{: toc-industry="Technology"}
2828
{: toc-use-case="ITServiceManagement"}
2929
{: toc-compliance="SAPCertified"}
30-
{: toc-version="5.0.1"}
30+
{: toc-version="5.1.1"}
3131

3232
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'.
3333

3434
## Architecture diagram
3535
{: #ext-architecture-diagram}
3636

37+
![Architecture diagram for 'Power Virtual Server with VPC landing zone' - variation 'PowerVS workspace Extension'](deploy-arch-ibm-pvs-inf-extension.svg "Architecture diagram"){: caption="Figure 1. Single-zone PowerVS workspace accessible over secure landing zone" caption-side="bottom"}{: external download="deploy-arch-ibm-pvs-inf-extension.svg"}
38+
3739
## Design requirements
3840
{: #ext-design-requirements}
3941

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-05-21"
4+
lastupdated: "2024-05-24"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -15,7 +15,7 @@ use-case: ITServiceManagement
1515
industry: Technology
1616
compliance: SAPCertified
1717
content-type: reference-architecture
18-
version: v5.0.1
18+
version: v5.1.1
1919

2020
---
2121

@@ -27,7 +27,7 @@ version: v5.0.1
2727
{: toc-industry="Technology"}
2828
{: toc-use-case="ITServiceManagement"}
2929
{: toc-compliance="SAPCertified"}
30-
{: toc-version="5.0.1"}
30+
{: toc-version="5.1.1"}
3131

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-05-21"
4+
lastupdated: "2024-05-24"
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: v5.0.1
18+
version: v5.1.1
1919

2020
---
2121

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024
4-
lastupdated: "2024-05-21"
4+
lastupdated: "2024-05-24"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -16,7 +16,7 @@ use-case: ITServiceManagement
1616
industry: Technology
1717
compliance:
1818
content-type: reference-architecture
19-
version: v5.0.1
19+
version: v5.1.1
2020

2121
---
2222

@@ -28,7 +28,7 @@ version: v5.0.1
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
3030
{: toc-compliance=""}
31-
{: toc-version="5.0.1"}
31+
{: toc-version="5.1.1"}
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

‎solutions/full-stack/provider.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ provider "ibm" {
6363

6464
provider "ibm" {
6565
alias = "ibm-sm"
66-
region = lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null)
66+
region = var.existing_sm_instance_region == null ? lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null) : var.existing_sm_instance_region
6767
zone = var.powervs_zone
6868
ibmcloud_api_key = var.ibmcloud_api_key != null ? var.ibmcloud_api_key : null
6969
}

‎solutions/quickstart/provider.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ provider "ibm" {
6363

6464
provider "ibm" {
6565
alias = "ibm-sm"
66-
region = lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null)
66+
region = var.existing_sm_instance_region == null ? lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null) : var.existing_sm_instance_region
6767
zone = var.powervs_zone
6868
ibmcloud_api_key = var.ibmcloud_api_key != null ? var.ibmcloud_api_key : null
6969
}

0 commit comments

Comments
 (0)