Skip to content

Commit 14dd615

Browse files
stafaniasajuterraform-ibm-modules-opssurajsbharadwaj
authored
fix: expose vpc, alb outputs, update terraform ibm to latest and terraform-module (#1043)
* fix: update landing_zone refs for version 7.4.4 SKIP UPGRADE TEST: breaking change updated outputs of variations --------- Co-authored-by: Terraform IBM Modules Operations <Terraform.IBM.Modules.Operations@ibm.com> Co-authored-by: surajsbharadwaj <101711050+surajsbharadwaj@users.noreply.github.com>
1 parent 9130d30 commit 14dd615

File tree

24 files changed

+118
-48
lines changed

24 files changed

+118
-48
lines changed

‎ibm_catalog.json

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,15 @@
371371
{
372372
"key": "vpc_names"
373373
},
374+
{
375+
"key": "vpc_data"
376+
},
374377
{
375378
"key": "vsi_names"
376379
},
380+
{
381+
"key": "application_load_balancer"
382+
},
377383
{
378384
"key": "ssh_public_key"
379385
},
@@ -549,7 +555,7 @@
549555
{
550556
"diagram": {
551557
"caption": "Power Virtual Server with VPC landing zone 'Standard' variation",
552-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.3/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
558+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.4/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
553559
"type": "image/svg+xml"
554560
},
555561
"description": "The Power Virtual Server with VPC landing zone as variation 'Create a new architecture' deploys VPC services and a Power Virtual Server workspace and interconnects them.\n \nRequired and optional management components are configured."
@@ -1010,9 +1016,15 @@
10101016
{
10111017
"key": "vpc_names"
10121018
},
1019+
{
1020+
"key": "vpc_data"
1021+
},
10131022
{
10141023
"key": "vsi_names"
10151024
},
1025+
{
1026+
"key": "application_load_balancer"
1027+
},
10161028
{
10171029
"key": "ssh_public_key"
10181030
},
@@ -1194,7 +1206,7 @@
11941206
{
11951207
"diagram": {
11961208
"caption": "Power Virtual Server with VPC landing zone 'Quickstart' variation",
1197-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.3/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
1209+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.4/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
11981210
"type": "image/svg+xml"
11991211
},
12001212
"description": "The Power Virtual Server with VPC landing zone as 'Quickstart' variation of 'Create a new architecture' option deploys VPC services and a Power Virtual Server workspace and interconnects them. It also creates one Power virtual server instance of chosen t-shirt size or custom configuration.\n \nRequired and optional management components are configured."
@@ -1520,7 +1532,7 @@
15201532
{
15211533
"diagram": {
15221534
"caption": "Power Virtual Server with VPC landing zone 'Import' variation",
1523-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.3/reference-architectures/import/deploy-arch-ibm-pvs-inf-import.svg",
1535+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.4/reference-architectures/import/deploy-arch-ibm-pvs-inf-import.svg",
15241536
"type": "image/svg+xml"
15251537
},
15261538
"description": "This solution helps to install the deployable architecture 'Power Virtual Server for SAP HANA' 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.\n \nRequired and optional management components are configured."
@@ -1731,9 +1743,15 @@
17311743
{
17321744
"key": "vpc_names"
17331745
},
1746+
{
1747+
"key": "vpc_data"
1748+
},
17341749
{
17351750
"key": "vsi_names"
17361751
},
1752+
{
1753+
"key": "application_load_balancer"
1754+
},
17371755
{
17381756
"key": "ssh_public_key"
17391757
},
@@ -1838,7 +1856,7 @@
18381856
{
18391857
"diagram": {
18401858
"caption": "Power Virtual Server with VPC landing zone 'Standard Extend' variation",
1841-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.3/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
1859+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.4/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
18421860
"type": "image/svg+xml"
18431861
},
18441862
"description": "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 already created Power Virtual Server with VPC landing zone. It builds on existing Power Virtual Server with VPC landing zone deployed as a variation 'Create a new architecture'."

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
106106

107107
| Name | Source | Version |
108108
|------|--------|---------|
109-
| <a name="module_client_to_site_vpn"></a> [client\_to\_site\_vpn](#module\_client\_to\_site\_vpn) | terraform-ibm-modules/client-to-site-vpn/ibm | 2.2.4 |
109+
| <a name="module_client_to_site_vpn"></a> [client\_to\_site\_vpn](#module\_client\_to\_site\_vpn) | terraform-ibm-modules/client-to-site-vpn/ibm | 2.2.5 |
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_configure_scc_wp_agent"></a> [configure\_scc\_wp\_agent](#module\_configure\_scc\_wp\_agent) | ./submodules/ansible | n/a |
113-
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 7.4.3 |
113+
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 7.4.4 |
114114
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 2.5.0 |
115115
| <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.6 |
116116
| <a name="module_scc_wp_instance"></a> [scc\_wp\_instance](#module\_scc\_wp\_instance) | terraform-ibm-modules/scc-workload-protection/ibm | 1.5.6 |
@@ -168,6 +168,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
168168
|------|-------------|
169169
| <a name="output_access_host_or_ip"></a> [access\_host\_or\_ip](#output\_access\_host\_or\_ip) | Access host(jump/bastion) for created PowerVS infrastructure. |
170170
| <a name="output_ansible_host_or_ip"></a> [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. |
171+
| <a name="output_application_load_balancer"></a> [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. |
171172
| <a name="output_dns_host_or_ip"></a> [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. |
172173
| <a name="output_monitoring_instance"></a> [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid, monitoring\_host\_ip. |
173174
| <a name="output_network_services_config"></a> [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ module "secrets_manager_private_certificate" {
125125
# Create client to site VPN Server
126126
module "client_to_site_vpn" {
127127
source = "terraform-ibm-modules/client-to-site-vpn/ibm"
128-
version = "2.2.4"
128+
version = "2.2.5"
129129
providers = { ibm = ibm.ibm-is }
130130
count = var.client_to_site_vpn.enable ? 1 : 0
131131

@@ -144,7 +144,7 @@ resource "ibm_is_vpc_routing_table" "transit" {
144144
provider = ibm.ibm-is
145145
count = var.client_to_site_vpn.enable ? 1 : 0
146146

147-
vpc = [for vpc in module.landing_zone.vpc_data : vpc.vpc_id if vpc.vpc_name == "${var.prefix}-edge-vpc"][0]
147+
vpc = [for vpc in module.landing_zone.vpc_data : vpc.vpc_id if vpc.vpc_name == "${var.prefix}-edge"][0]
148148
name = "${var.prefix}-route-table-vpn-server-transit"
149149
route_transit_gateway_ingress = true
150150
accept_routes_from_resource_type = ["vpn_server"]
@@ -158,6 +158,6 @@ resource "ibm_is_vpc_address_prefix" "vpn_address_prefix" {
158158

159159
zone = "${lookup(local.ibm_powervs_zone_cloud_region_map, var.powervs_zone, null)}-1"
160160
name = "${var.prefix}-vpn-address-prefix"
161-
vpc = [for vpc in module.landing_zone.vpc_data : vpc.vpc_id if vpc.vpc_name == "${var.prefix}-edge-vpc"][0]
161+
vpc = [for vpc in module.landing_zone.vpc_data : vpc.vpc_id if vpc.vpc_name == "${var.prefix}-edge"][0]
162162
cidr = var.client_to_site_vpn.client_ip_pool
163163
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ locals {
1818

1919
module "landing_zone" {
2020
source = "terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module"
21-
version = "7.4.3"
21+
version = "7.4.4"
2222
providers = { ibm = ibm.ibm-is }
2323

2424
ssh_public_key = var.ssh_public_key

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ output "resource_group_data" {
5252
value = module.landing_zone.resource_group_data
5353
}
5454

55+
output "application_load_balancer" {
56+
description = "Details of application load balancer."
57+
value = var.configure_nfs_server ? module.vpc_file_share_alb[0].file_share_alb : { name = "", id = "", private_ips = [] }
58+
}
59+
5560
output "access_host_or_ip" {
5661
description = "Access host(jump/bastion) for created PowerVS infrastructure."
5762
value = local.access_host_or_ip

‎modules/powervs-vpc-landing-zone/submodules/fileshare-alb/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ No modules.
4343

4444
| Name | Description |
4545
|------|-------------|
46+
| <a name="output_file_share_alb"></a> [file\_share\_alb](#output\_file\_share\_alb) | Details of application load balancer. |
4647
| <a name="output_nfs_host_or_ip_path"></a> [nfs\_host\_or\_ip\_path](#output\_nfs\_host\_or\_ip\_path) | NFS mount path for created infrastructure. |
4748
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎modules/powervs-vpc-landing-zone/submodules/fileshare-alb/outputs.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
output "file_share_alb" {
2+
description = "Details of application load balancer."
3+
value = {
4+
name = ibm_is_lb.file_share_alb.name
5+
id = ibm_is_lb.file_share_alb.id
6+
private_ips = [for private_ip in ibm_is_lb.file_share_alb.private_ip : private_ip.address]
7+
}
8+
}
9+
110
output "nfs_host_or_ip_path" {
211
description = "NFS mount path for created infrastructure."
312
value = "${ibm_is_lb.file_share_alb.private_ip[1].address}:${split(":", ibm_is_share_mount_target.mount_target_nfs.mount_path)[1]}"

‎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, 2025
4-
lastupdated: "2025-04-11"
4+
lastupdated: "2025-04-14"
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: v8.2.3
19+
version: v8.2.4
2020

2121
---
2222

@@ -27,7 +27,7 @@ version: v8.2.3
2727
{: toc-content-type="reference-architecture"}
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
30-
{: toc-version="v8.2.3"}
30+
{: toc-version="v8.2.4"}
3131

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

‎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, 2025
4-
lastupdated: "2025-04-11"
4+
lastupdated: "2025-04-14"
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.2.3
18+
version: v8.2.4
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="v8.2.3"}
31+
{: toc-version="v8.2.4"}
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
copyright:
33
years: 2024, 2025
4-
lastupdated: "2025-04-11"
4+
lastupdated: "2025-04-14"
55
keywords:
66
subcollection: deployable-reference-architectures
77
authors:
@@ -16,7 +16,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf
1616
use-case: ITServiceManagement
1717
industry: Technology
1818
content-type: reference-architecture
19-
version: v8.2.3
19+
version: v8.2.4
2020
compliance:
2121

2222
---
@@ -28,7 +28,7 @@ compliance:
2828
{: toc-content-type="reference-architecture"}
2929
{: toc-industry="Technology"}
3030
{: toc-use-case="ITServiceManagement"}
31-
{: toc-version="v8.2.3"}
31+
{: toc-version="v8.2.4"}
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

0 commit comments

Comments
 (0)