diff --git a/ibm_catalog.json b/ibm_catalog.json index 57175997..06bb1368 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -370,6 +370,12 @@ { "key": "vsi_names" }, + { + "key": "kms_key_map" + }, + { + "key": "vsi_ssh_key_data" + }, { "key": "application_load_balancer" }, @@ -554,7 +560,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Standard Landscape' variation", - "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", + "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", "type": "image/svg+xml" }, "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 @@ { "key": "vsi_list" }, + { + "key": "kms_key_map" + }, + { + "key": "vsi_ssh_key_data" + }, { "key": "resource_group_data" }, @@ -1209,7 +1221,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Quickstart' variation", - "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", + "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", "type": "image/svg+xml" }, "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 @@ { "key": "vsi_names" }, + { + "key": "kms_key_map" + }, + { + "key": "vsi_ssh_key_data" + }, { "key": "application_load_balancer" }, @@ -1530,7 +1548,7 @@ { "diagram": { "caption": "Power Virtual Server with VPC landing zone 'Extend Standard Landscape' variation", - "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", + "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", "type": "image/svg+xml" }, "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'." diff --git a/modules/powervs-vpc-landing-zone/README.md b/modules/powervs-vpc-landing-zone/README.md index ed9bde33..ca7503cd 100644 --- a/modules/powervs-vpc-landing-zone/README.md +++ b/modules/powervs-vpc-landing-zone/README.md @@ -109,7 +109,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr | [configure\_network\_services](#module\_configure\_network\_services) | ./submodules/ansible | n/a | | [configure\_scc\_wp\_agent](#module\_configure\_scc\_wp\_agent) | ./submodules/ansible | n/a | | [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 7.4.4 | -| [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.1 | +| [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.2 | | [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.3.6 | | [scc\_wp\_instance](#module\_scc\_wp\_instance) | terraform-ibm-modules/scc-workload-protection/ibm | 1.5.10 | | [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 | [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. | | [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. | | [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. | +| [kms\_key\_map](#output\_kms\_key\_map) | Map of ids and keys for KMS keys created | | [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid, monitoring\_host\_ip. | | [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. | | [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 | [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. | | [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. | | [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. | +| [vsi\_ssh\_key\_data](#output\_vsi\_ssh\_key\_data) | List of SSH key data | diff --git a/modules/powervs-vpc-landing-zone/main.tf b/modules/powervs-vpc-landing-zone/main.tf index 1f129874..545a4d4e 100644 --- a/modules/powervs-vpc-landing-zone/main.tf +++ b/modules/powervs-vpc-landing-zone/main.tf @@ -134,7 +134,7 @@ locals { module "powervs_workspace" { source = "terraform-ibm-modules/powervs-workspace/ibm" - version = "3.0.1" + version = "3.0.2" providers = { ibm = ibm.ibm-pi } diff --git a/modules/powervs-vpc-landing-zone/outputs.tf b/modules/powervs-vpc-landing-zone/outputs.tf index 1eb21ea9..b726858f 100644 --- a/modules/powervs-vpc-landing-zone/outputs.tf +++ b/modules/powervs-vpc-landing-zone/outputs.tf @@ -47,6 +47,16 @@ output "vpc_data" { value = module.landing_zone.vpc_data } +output "kms_key_map" { + description = "Map of ids and keys for KMS keys created" + value = module.landing_zone.key_map +} + +output "vsi_ssh_key_data" { + description = "List of SSH key data" + value = module.landing_zone.ssh_key_data +} + output "resource_group_data" { description = "List of resource groups data used within landing zone." value = module.landing_zone.resource_group_data diff --git a/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md b/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md index 24786648..c256387e 100644 --- a/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md +++ b/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-05-06" +lastupdated: "2025-05-08" keywords: subcollection: deployable-reference-architectures authors: @@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.4.0 +version: v8.4.1 compliance: SAPCertified --- @@ -28,7 +28,7 @@ compliance: SAPCertified {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v8.4.0"} +{: toc-version="v8.4.1"} 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'. diff --git a/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md b/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md index 5023fa04..50398e85 100644 --- a/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md +++ b/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-05-06" +lastupdated: "2025-05-08" keywords: subcollection: deployable-reference-architectures authors: @@ -16,7 +16,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.4.0 +version: v8.4.1 compliance: --- @@ -28,7 +28,7 @@ compliance: {: toc-content-type="reference-architecture"} {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} -{: toc-version="v8.4.0"} +{: toc-version="v8.4.1"} 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. diff --git a/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md b/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md index f57ddee8..65d2e596 100644 --- a/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md +++ b/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.md @@ -1,7 +1,7 @@ --- copyright: years: 2024, 2025 -lastupdated: "2025-05-06" +lastupdated: "2025-05-08" keywords: subcollection: deployable-reference-architectures authors: @@ -15,7 +15,7 @@ image_source: https://github.com/terraform-ibm-modules/terraform-ibm-powervs-inf use-case: ITServiceManagement industry: Technology content-type: reference-architecture -version: v8.4.0 +version: v8.4.1 compliance: SAPCertified --- @@ -28,7 +28,7 @@ compliance: SAPCertified {: toc-industry="Technology"} {: toc-use-case="ITServiceManagement"} {: toc-compliance="SAPCertified"} -{: toc-version="v8.4.0"} +{: toc-version="v8.4.1"} The Standard deployment of the Power Virtual Server with VPC landing zone creates VPC services and a Power Virtual Server workspace and interconnects them. diff --git a/solutions/standard-extend/README.md b/solutions/standard-extend/README.md index b62bb5eb..ae1c4fbc 100644 --- a/solutions/standard-extend/README.md +++ b/solutions/standard-extend/README.md @@ -42,7 +42,7 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari | Name | Source | Version | |------|--------|---------| -| [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.1 | +| [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 3.0.2 | ### Resources @@ -75,6 +75,7 @@ If you do not have a PowerVS infrastructure that is the [Standard Landscape Vari | [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. | | [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. | | [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. | +| [kms\_key\_map](#output\_kms\_key\_map) | Map of ids and keys for KMS keys created | | [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid. | | [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. | | [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 | [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. | | [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. | | [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. | +| [vsi\_ssh\_key\_data](#output\_vsi\_ssh\_key\_data) | List of VSI SSH key data | diff --git a/solutions/standard-extend/main.tf b/solutions/standard-extend/main.tf index 4861f6f8..06b5f68d 100644 --- a/solutions/standard-extend/main.tf +++ b/solutions/standard-extend/main.tf @@ -23,7 +23,7 @@ locals { module "powervs_workspace" { source = "terraform-ibm-modules/powervs-workspace/ibm" - version = "3.0.1" + version = "3.0.2" pi_zone = var.powervs_zone pi_resource_group_name = var.powervs_resource_group_name diff --git a/solutions/standard-extend/outputs.tf b/solutions/standard-extend/outputs.tf index dbf7173e..fcd82d12 100644 --- a/solutions/standard-extend/outputs.tf +++ b/solutions/standard-extend/outputs.tf @@ -22,6 +22,15 @@ output "vpc_data" { value = local.standard_output[0].vpc_data.value } +output "kms_key_map" { + description = "Map of ids and keys for KMS keys created" + value = local.standard_output[0].kms_key_map.value +} + +output "vsi_ssh_key_data" { + description = "List of VSI SSH key data" + value = local.standard_output[0].vsi_ssh_key_data.value +} output "application_load_balancer" { description = "Details of application load balancer." value = local.standard_output[0].application_load_balancer.value diff --git a/solutions/standard-plus-vsi/README.md b/solutions/standard-plus-vsi/README.md index 38a41143..9b29238b 100644 --- a/solutions/standard-plus-vsi/README.md +++ b/solutions/standard-plus-vsi/README.md @@ -105,6 +105,7 @@ This example sets up the following infrastructure: | [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. | | [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. | | [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. | +| [kms\_key\_map](#output\_kms\_key\_map) | Map of ids and keys for KMS keys created | | [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid. | | [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. | | [nfs\_host\_or\_ip\_path](#output\_nfs\_host\_or\_ip\_path) | NFS host for created PowerVS infrastructure. | @@ -133,4 +134,5 @@ This example sets up the following infrastructure: | [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. | | [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. | | [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. | +| [vsi\_ssh\_key\_data](#output\_vsi\_ssh\_key\_data) | List of VSI SSH key data | diff --git a/solutions/standard-plus-vsi/outputs.tf b/solutions/standard-plus-vsi/outputs.tf index ec13b835..145cfdf7 100644 --- a/solutions/standard-plus-vsi/outputs.tf +++ b/solutions/standard-plus-vsi/outputs.tf @@ -22,6 +22,16 @@ output "vpc_data" { value = module.standard.vpc_data } +output "kms_key_map" { + description = "Map of ids and keys for KMS keys created" + value = module.standard.kms_key_map +} + +output "vsi_ssh_key_data" { + description = "List of VSI SSH key data" + value = module.standard.vsi_ssh_key_data +} + output "application_load_balancer" { description = "Details of application load balancer." value = module.standard.application_load_balancer diff --git a/solutions/standard/README.md b/solutions/standard/README.md index 667dcdf6..7a6ced43 100644 --- a/solutions/standard/README.md +++ b/solutions/standard/README.md @@ -103,6 +103,7 @@ No resources. | [ansible\_host\_or\_ip](#output\_ansible\_host\_or\_ip) | Central Ansible node private IP address. | | [application\_load\_balancer](#output\_application\_load\_balancer) | Details of application load balancer. | | [dns\_host\_or\_ip](#output\_dns\_host\_or\_ip) | DNS forwarder host for created PowerVS infrastructure. | +| [kms\_key\_map](#output\_kms\_key\_map) | Map of ids and keys for KMS keys created | | [monitoring\_instance](#output\_monitoring\_instance) | Details of the IBM Cloud Monitoring Instance: CRN, location, guid. | | [network\_services\_config](#output\_network\_services\_config) | Complete configuration of network management services. | | [nfs\_host\_or\_ip\_path](#output\_nfs\_host\_or\_ip\_path) | NFS host for created PowerVS infrastructure. | @@ -129,4 +130,5 @@ No resources. | [vpc\_names](#output\_vpc\_names) | A list of the names of the VPC. | | [vsi\_list](#output\_vsi\_list) | A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. | | [vsi\_names](#output\_vsi\_names) | A list of the vsis names provisioned within the VPCs. | +| [vsi\_ssh\_key\_data](#output\_vsi\_ssh\_key\_data) | List of VSI SSH key data | diff --git a/solutions/standard/outputs.tf b/solutions/standard/outputs.tf index 89507363..310fb3df 100644 --- a/solutions/standard/outputs.tf +++ b/solutions/standard/outputs.tf @@ -22,6 +22,16 @@ output "vpc_data" { value = module.standard.vpc_data } +output "kms_key_map" { + description = "Map of ids and keys for KMS keys created" + value = module.standard.kms_key_map +} + +output "vsi_ssh_key_data" { + description = "List of VSI SSH key data" + value = module.standard.vsi_ssh_key_data +} + output "application_load_balancer" { description = "Details of application load balancer." value = module.standard.application_load_balancer