Skip to content

Commit d5f5a26

Browse files
BeilmannArnold Beilmann
Beilmann
and
Arnold Beilmann
authored
feat: enable global TGW support (#883)
Co-authored-by: Arnold Beilmann <arnold.beilmann@de.ibm.com>
1 parent 6e13f48 commit d5f5a26

File tree

14 files changed

+60
-16
lines changed

14 files changed

+60
-16
lines changed

‎ibm_catalog.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@
224224
"key": "powervs_image_names",
225225
"required": true
226226
},
227+
{
228+
"key": "transit_gateway_global"
229+
},
227230
{
228231
"key": "configure_dns_forwarder"
229232
},
@@ -277,7 +280,7 @@
277280
},
278281
{
279282
"displayname": "eu-de",
280-
"value": "eu-es"
283+
"value": "eu-de"
281284
},
282285
{
283286
"displayname": "eu-gb",
@@ -325,6 +328,9 @@
325328
{
326329
"key": "transit_gateway_id"
327330
},
331+
{
332+
"key": "transit_gateway_global"
333+
},
328334
{
329335
"key": "vsi_list"
330336
},
@@ -879,7 +885,7 @@
879885
},
880886
{
881887
"displayname": "eu-de",
882-
"value": "eu-es"
888+
"value": "eu-de"
883889
},
884890
{
885891
"displayname": "eu-gb",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
140140
| <a name="input_ssh_private_key"></a> [ssh\_private\_key](#input\_ssh\_private\_key) | Private SSH key (RSA format) to login to Intel VSIs to configure network management services (SQUID, NTP, DNS and ansible). Should match to public SSH key referenced by 'ssh\_public\_key'. The key is not uploaded or stored. For more information about SSH keys, see [SSH keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys). | `string` | n/a | yes |
141141
| <a name="input_ssh_public_key"></a> [ssh\_public\_key](#input\_ssh\_public\_key) | Public SSH Key for VSI creation. Must be an RSA key with a key size of either 2048 bits or 4096 bits (recommended). Must be a valid SSH key that does not already exist in the deployment region. | `string` | n/a | yes |
142142
| <a name="input_tags"></a> [tags](#input\_tags) | List of tag names for the IBM Cloud PowerVS workspace | `list(string)` | `[]` | no |
143+
| <a name="input_transit_gateway_global"></a> [transit\_gateway\_global](#input\_transit\_gateway\_global) | Connect to the networks outside the associated region. | `bool` | `false` | no |
143144

144145
### Outputs
145146

@@ -164,6 +165,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
164165
| <a name="output_proxy_host_or_ip_port"></a> [proxy\_host\_or\_ip\_port](#output\_proxy\_host\_or\_ip\_port) | Proxy host:port for created PowerVS infrastructure. |
165166
| <a name="output_resource_group_data"></a> [resource\_group\_data](#output\_resource\_group\_data) | List of resource groups data used within landing zone. |
166167
| <a name="output_ssh_public_key"></a> [ssh\_public\_key](#output\_ssh\_public\_key) | The string value of the ssh public key used when deploying VPC |
168+
| <a name="output_transit_gateway_global"></a> [transit\_gateway\_global](#output\_transit\_gateway\_global) | Connect to the networks outside the associated region. |
167169
| <a name="output_transit_gateway_id"></a> [transit\_gateway\_id](#output\_transit\_gateway\_id) | The ID of transit gateway. |
168170
| <a name="output_transit_gateway_name"></a> [transit\_gateway\_name](#output\_transit\_gateway\_name) | The name of the transit gateway. |
169171
| <a name="output_vpc_data"></a> [vpc\_data](#output\_vpc\_data) | List of VPC data. |

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ locals {
2929
external_access_ip = var.external_access_ip != null && var.external_access_ip != "" ? length(regexall("/", var.external_access_ip)) > 0 ? var.external_access_ip : "${var.external_access_ip}/32" : ""
3030
override_json_string = templatefile("${path.module}/presets/slz-preset.json.tftpl",
3131
{
32-
external_access_ip = local.external_access_ip,
33-
vsi_image = "ibm-redhat-8-8-amd64-sap-applications-1"
32+
external_access_ip = local.external_access_ip,
33+
vsi_image = "ibm-redhat-8-8-amd64-sap-applications-1",
34+
transit_gateway_global = var.transit_gateway_global
3435
}
3536
)
3637
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ output "transit_gateway_id" {
3232
value = module.landing_zone.transit_gateway_data.id
3333
}
3434

35+
output "transit_gateway_global" {
36+
description = "Connect to the networks outside the associated region."
37+
value = var.transit_gateway_global
38+
}
39+
3540
output "vsi_list" {
3641
description = "A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP."
3742
value = module.landing_zone.vsi_list

‎modules/powervs-vpc-landing-zone/presets/slz-preset.json.tftpl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
},
118118
"enable_transit_gateway": true,
119119
"transit_gateway_resource_group": "slz-service-rg",
120+
"transit_gateway_global": ${transit_gateway_global},
120121
"transit_gateway_connections": [
121122
"edge"
122123
],

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ variable "ssh_private_key" {
4444
sensitive = true
4545
}
4646

47+
#####################################################
48+
# Optional Parameters IBM Cloud Services
49+
#####################################################
50+
51+
variable "transit_gateway_global" {
52+
description = "Connect to the networks outside the associated region."
53+
type = bool
54+
default = false
55+
}
56+
4757
#####################################################
4858
# Optional Parameters VSI OS Management Services
4959
#####################################################

‎reference-architectures/import/deploy-arch-ibm-pvs-inf-import.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-06-05"
4+
lastupdated: "2024-07-02"
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.2.0
18+
version: v5.2.1
1919

2020
---
2121

@@ -26,7 +26,7 @@ version: v5.2.0
2626
{: toc-industry="Technology"}
2727
{: toc-use-case="ITServiceManagement"}
2828
{: toc-compliance="SAPCertified"}
29-
{: toc-version="4.11.0"}
29+
{: toc-version="5.2.1"}
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

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-06-05"
4+
lastupdated: "2024-07-02"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -14,7 +14,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1414
use-case: ITServiceManagement
1515
industry: Technology
1616
content-type: reference-architecture
17-
version: v5.2.0
17+
version: v5.2.1
1818
compliance: SAPCertified
1919

2020
---
@@ -27,7 +27,7 @@ compliance: SAPCertified
2727
{: toc-industry="Technology"}
2828
{: toc-use-case="ITServiceManagement"}
2929
{: toc-compliance="SAPCertified"}
30-
{: toc-version="5.2.0"}
30+
{: toc-version="5.2.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

‎reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.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-06-05"
4+
lastupdated: "2024-07-02"
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: v5.2.0
18+
version: v5.2.1
1919
compliance:
2020

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

‎reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.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-06-05"
4+
lastupdated: "2024-07-02"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -14,7 +14,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1414
use-case: ITServiceManagement
1515
industry: Technology
1616
content-type: reference-architecture
17-
version: v5.2.0
17+
version: v5.2.1
1818
compliance: SAPCertified
1919

2020
---
@@ -27,7 +27,7 @@ compliance: SAPCertified
2727
{: toc-industry="Technology"}
2828
{: toc-use-case="ITServiceManagement"}
2929
{: toc-compliance="SAPCertified"}
30-
{: toc-version="5.2.0"}
30+
{: toc-version="5.2.1"}
3131

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

0 commit comments

Comments
 (0)