Skip to content

Commit f05dee9

Browse files
surajsbharadwajsurajsbharadwaj
authored
fix: expose kms_key and ssh_key_data from landing zone (#1064)
1 parent f46e6b3 commit f05dee9

File tree

14 files changed

+81
-16
lines changed

14 files changed

+81
-16
lines changed

‎ibm_catalog.json

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,12 @@
370370
{
371371
"key": "vsi_names"
372372
},
373+
{
374+
"key": "kms_key_map"
375+
},
376+
{
377+
"key": "vsi_ssh_key_data"
378+
},
373379
{
374380
"key": "application_load_balancer"
375381
},
@@ -554,7 +560,7 @@
554560
{
555561
"diagram": {
556562
"caption": "Power Virtual Server with VPC landing zone 'Standard Landscape' variation",
557-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.0/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
563+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.1/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
558564
"type": "image/svg+xml"
559565
},
560566
"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."
@@ -1034,6 +1040,12 @@
10341040
{
10351041
"key": "vsi_list"
10361042
},
1043+
{
1044+
"key": "kms_key_map"
1045+
},
1046+
{
1047+
"key": "vsi_ssh_key_data"
1048+
},
10371049
{
10381050
"key": "resource_group_data"
10391051
},
@@ -1209,7 +1221,7 @@
12091221
{
12101222
"diagram": {
12111223
"caption": "Power Virtual Server with VPC landing zone 'Quickstart' variation",
1212-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.0/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
1224+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.1/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
12131225
"type": "image/svg+xml"
12141226
},
12151227
"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."
@@ -1425,6 +1437,12 @@
14251437
{
14261438
"key": "vsi_names"
14271439
},
1440+
{
1441+
"key": "kms_key_map"
1442+
},
1443+
{
1444+
"key": "vsi_ssh_key_data"
1445+
},
14281446
{
14291447
"key": "application_load_balancer"
14301448
},
@@ -1530,7 +1548,7 @@
15301548
{
15311549
"diagram": {
15321550
"caption": "Power Virtual Server with VPC landing zone 'Extend Standard Landscape' variation",
1533-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.0/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
1551+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.4.1/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
15341552
"type": "image/svg+xml"
15351553
},
15361554
"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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
109109
| <a name="module_configure_network_services"></a> [configure\_network\_services](#module\_configure\_network\_services) | ./submodules/ansible | n/a |
110110
| <a name="module_configure_scc_wp_agent"></a> [configure\_scc\_wp\_agent](#module\_configure\_scc\_wp\_agent) | ./submodules/ansible | n/a |
111111
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 7.4.4 |
112-
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.1 |
112+
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.2 |
113113
| <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 |
114114
| <a name="module_scc_wp_instance"></a> [scc\_wp\_instance](#module\_scc\_wp\_instance) | terraform-ibm-modules/scc-workload-protection/ibm | 1.5.10 |
115115
| <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.4 |
@@ -167,6 +167,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
167167
| <a name="output_ansible_host_or_ip"></a> [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. |
168168
| <a name="output_application_load_balancer"></a> [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. |
169169
| <a name="output_dns_host_or_ip"></a> [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. |
170+
| <a name="output_kms_key_map"></a> [kms\_key\_map](#output\_kms\_key\_map) | Map of ids and keys for KMS keys created |
170171
| <a name="output_monitoring_instance"></a> [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid, monitoring\_host\_ip. |
171172
| <a name="output_network_services_config"></a> [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. |
172173
| <a name="output_nfs_host_or_ip_path"></a> [nfs\_host\_or\_ip\_path](#output\_nfs\_host\_or\_ip\_path) | NFS host for created PowerVS infrastructure. |
@@ -192,4 +193,5 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
192193
| <a name="output_vpc_names"></a> [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. |
193194
| <a name="output_vsi_list"></a> [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. |
194195
| <a name="output_vsi_names"></a> [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. |
196+
| <a name="output_vsi_ssh_key_data"></a> [vsi\_ssh\_key\_data](#output\_vsi\_ssh\_key\_data) | List of SSH key data |
195197
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

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

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

135135
module "powervs_workspace" {
136136
source = "terraform-ibm-modules/powervs-workspace/ibm"
137-
version = "3.0.1"
137+
version = "3.0.2"
138138

139139
providers = { ibm = ibm.ibm-pi }
140140

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ output "vpc_data" {
4747
value = module.landing_zone.vpc_data
4848
}
4949

50+
output "kms_key_map" {
51+
description = "Map of ids and keys for KMS keys created"
52+
value = module.landing_zone.key_map
53+
}
54+
55+
output "vsi_ssh_key_data" {
56+
description = "List of SSH key data"
57+
value = module.landing_zone.ssh_key_data
58+
}
59+
5060
output "resource_group_data" {
5161
description = "List of resource groups data used within landing zone."
5262
value = module.landing_zone.resource_group_data

‎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-05-06"
4+
lastupdated: "2025-05-08"
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.4.0
18+
version: v8.4.1
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.4.0"}
31+
{: toc-version="v8.4.1"}
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-05-06"
4+
lastupdated: "2025-05-08"
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.4.0
19+
version: v8.4.1
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.4.0"}
31+
{: toc-version="v8.4.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, 2025
4-
lastupdated: "2025-05-06"
4+
lastupdated: "2025-05-08"
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.4.0
18+
version: v8.4.1
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.4.0"}
31+
{: toc-version="v8.4.1"}
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/standard-extend/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari
4242

4343
| Name | Source | Version |
4444
|------|--------|---------|
45-
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.1 |
45+
| <a name="module_powervs_workspace"></a> [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.2 |
4646

4747
### Resources
4848

@@ -75,6 +75,7 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari
7575
| <a name="output_ansible_host_or_ip"></a> [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. |
7676
| <a name="output_application_load_balancer"></a> [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. |
7777
| <a name="output_dns_host_or_ip"></a> [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. |
78+
| <a name="output_kms_key_map"></a> [kms\_key\_map](#output\_kms\_key\_map) | Map of ids and keys for KMS keys created |
7879
| <a name="output_monitoring_instance"></a> [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid. |
7980
| <a name="output_network_services_config"></a> [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. |
8081
| <a name="output_nfs_host_or_ip_path"></a> [nfs\_host\_or\_ip\_path](#output\_nfs\_host\_or\_ip\_path) | NFS host for created PowerVS infrastructure. |
@@ -99,4 +100,5 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari
99100
| <a name="output_vpc_names"></a> [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. |
100101
| <a name="output_vsi_list"></a> [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. |
101102
| <a name="output_vsi_names"></a> [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. |
103+
| <a name="output_vsi_ssh_key_data"></a> [vsi\_ssh\_key\_data](#output\_vsi\_ssh\_key\_data) | List of VSI SSH key data |
102104
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎solutions/standard-extend/main.tf

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

2424
module "powervs_workspace" {
2525
source = "terraform-ibm-modules/powervs-workspace/ibm"
26-
version = "3.0.1"
26+
version = "3.0.2"
2727

2828
pi_zone = var.powervs_zone
2929
pi_resource_group_name = var.powervs_resource_group_name

‎solutions/standard-extend/outputs.tf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ output "vpc_data" {
2222
value = local.standard_output[0].vpc_data.value
2323
}
2424

25+
output "kms_key_map" {
26+
description = "Map of ids and keys for KMS keys created"
27+
value = local.standard_output[0].kms_key_map.value
28+
}
29+
30+
output "vsi_ssh_key_data" {
31+
description = "List of VSI SSH key data"
32+
value = local.standard_output[0].vsi_ssh_key_data.value
33+
}
2534
output "application_load_balancer" {
2635
description = "Details of application load balancer."
2736
value = local.standard_output[0].application_load_balancer.value

0 commit comments

Comments
 (0)