Skip to content

Commit 3e08e6c

Browse files
ludwig-muellerterraform-ibm-modules-opsstafaniasajusurajsbharadwaj
authored
fix: increase maximum length of prefix to 16 (#1027)
* chore(deps): update terraform ibm to latest for deployable architectures * chore(deps): update terraform-module * chore(deps): update ci dependencies * chore: fix for default test location selection * chore: fix for default test location selection * chore: terratest update * chore: rm common-go-assets * fix: update instance module to 2.5.2 to increase maximum length of prefix to 16 * docs: update toc version, lastupdated --------- Co-authored-by: Terraform IBM Modules Operations <Terraform.IBM.Modules.Operations@ibm.com> Co-authored-by: stafaniasaju <stafania.saju@ibm.com> Co-authored-by: surajsbharadwaj <101711050+surajsbharadwaj@users.noreply.github.com>
1 parent 64527d9 commit 3e08e6c

File tree

20 files changed

+43
-43
lines changed

20 files changed

+43
-43
lines changed

ibm_catalog.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@
549549
{
550550
"diagram": {
551551
"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.1/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
552+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.2/reference-architectures/standard/deploy-arch-ibm-pvs-inf-standard.svg",
553553
"type": "image/svg+xml"
554554
},
555555
"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."
@@ -1194,7 +1194,7 @@
11941194
{
11951195
"diagram": {
11961196
"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.1/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
1197+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.2/reference-architectures/standard-plus-vsi/deploy-arch-ibm-pvs-inf-standard-plus-vsi.svg",
11981198
"type": "image/svg+xml"
11991199
},
12001200
"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 +1520,7 @@
15201520
{
15211521
"diagram": {
15221522
"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.1/reference-architectures/import/deploy-arch-ibm-pvs-inf-import.svg",
1523+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.2/reference-architectures/import/deploy-arch-ibm-pvs-inf-import.svg",
15241524
"type": "image/svg+xml"
15251525
},
15261526
"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."
@@ -1838,7 +1838,7 @@
18381838
{
18391839
"diagram": {
18401840
"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.1/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
1841+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/refs/tags/v8.2.2/reference-architectures/standard-extend/deploy-arch-ibm-pvs-inf-standard-extend.svg",
18421842
"type": "image/svg+xml"
18431843
},
18441844
"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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ 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.1.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.1.6 |
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.3.1 |
113+
| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | terraform-ibm-modules/landing-zone/ibm//patterns//vsi//module | 7.3.2 |
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.5 |
116-
| <a name="module_scc_wp_instance"></a> [scc\_wp\_instance](#module\_scc\_wp\_instance) | terraform-ibm-modules/scc-workload-protection/ibm | 1.4.3 |
116+
| <a name="module_scc_wp_instance"></a> [scc\_wp\_instance](#module\_scc\_wp\_instance) | terraform-ibm-modules/scc-workload-protection/ibm | 1.5.3 |
117117
| <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.2.3 |
118118
| <a name="module_secrets_manager_private_certificate"></a> [secrets\_manager\_private\_certificate](#module\_secrets\_manager\_private\_certificate) | terraform-ibm-modules/secrets-manager-private-cert/ibm | 1.3.2 |
119119
| <a name="module_vpc_file_share_alb"></a> [vpc\_file\_share\_alb](#module\_vpc\_file\_share\_alb) | ./submodules/fileshare-alb | n/a |
@@ -154,7 +154,7 @@ Creates VPC Landing Zone | Performs VPC VSI OS Config | Creates PowerVS Infrastr
154154
| <a name="input_powervs_management_network"></a> [powervs\_management\_network](#input\_powervs\_management\_network) | Name of the IBM Cloud PowerVS management subnet and CIDR to create. | <pre>object({<br/> name = string<br/> cidr = string<br/> })</pre> | <pre>{<br/> "cidr": "10.51.0.0/24",<br/> "name": "mgmt_net"<br/>}</pre> | no |
155155
| <a name="input_powervs_resource_group_name"></a> [powervs\_resource\_group\_name](#input\_powervs\_resource\_group\_name) | Existing IBM Cloud resource group name. | `string` | n/a | yes |
156156
| <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS infrastructure will be created. | `string` | n/a | yes |
157-
| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 10 or fewer characters. | `string` | n/a | yes |
157+
| <a name="input_prefix"></a> [prefix](#input\_prefix) | A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. Must contain only lowercase letters, numbers, and - characters. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters. | `string` | n/a | yes |
158158
| <a name="input_sm_service_plan"></a> [sm\_service\_plan](#input\_sm\_service\_plan) | The service/pricing plan to use when provisioning a new Secrets Manager instance. Allowed values: `standard` and `trial`. Only used if `existing_sm_instance_guid` is set to null. | `string` | `"standard"` | no |
159159
| <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 |
160160
| <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 |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ module "secrets_manager_private_certificate" {
122122
# Create client to site VPN Server
123123
module "client_to_site_vpn" {
124124
source = "terraform-ibm-modules/client-to-site-vpn/ibm"
125-
version = "2.1.4"
125+
version = "2.1.6"
126126
providers = { ibm = ibm.ibm-is }
127127
count = var.client_to_site_vpn.enable ? 1 : 0
128128

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

Lines changed: 2 additions & 2 deletions
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.3.1"
21+
version = "7.3.2"
2222
providers = { ibm = ibm.ibm-is }
2323

2424
ssh_public_key = var.ssh_public_key
@@ -57,7 +57,7 @@ locals {
5757

5858
module "scc_wp_instance" {
5959
source = "terraform-ibm-modules/scc-workload-protection/ibm"
60-
version = "1.4.3"
60+
version = "1.5.3"
6161
providers = { ibm = ibm.ibm-is }
6262
count = var.enable_scc_wp ? 1 : 0
6363

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ variable "powervs_resource_group_name" {
99
}
1010

1111
variable "prefix" {
12-
description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 10 or fewer characters."
12+
description = "A unique identifier for resources. Must begin with a lowercase letter and end with a lowercase letter or number. Must contain only lowercase letters, numbers, and - characters. This prefix will be prepended to any resources provisioned by this template. Prefixes must be 16 or fewer characters."
1313
type = string
1414
}
1515

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-03-18"
4+
lastupdated: "2025-03-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: v8.2.1
19+
version: v8.2.2
2020

2121
---
2222

@@ -27,7 +27,7 @@ version: v8.2.1
2727
{: toc-content-type="reference-architecture"}
2828
{: toc-industry="Technology"}
2929
{: toc-use-case="ITServiceManagement"}
30-
{: toc-version="v8.2.1"}
30+
{: toc-version="v8.2.2"}
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-03-18"
4+
lastupdated: "2025-03-24"
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.1
18+
version: v8.2.2
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.1"}
31+
{: toc-version="v8.2.2"}
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-03-18"
4+
lastupdated: "2025-03-24"
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.1
19+
version: v8.2.2
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.1"}
31+
{: toc-version="v8.2.2"}
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-03-18"
4+
lastupdated: "2025-03-24"
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.1
18+
version: v8.2.2
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.1"}
31+
{: toc-version="v8.2.2"}
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/import/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The pre-existing infrastructure must meet the following conditions to use the 'I
4343
| Name | Version |
4444
|------|---------|
4545
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.9 |
46-
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.1 |
46+
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.76.2 |
4747

4848
### Modules
4949

@@ -58,9 +58,9 @@ The pre-existing infrastructure must meet the following conditions to use the 'I
5858

5959
| Name | Type |
6060
|------|------|
61-
| [ibm_is_network_acl.management_acls_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/is_network_acl) | data source |
62-
| [ibm_is_subnet.management_subnets_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/is_subnet) | data source |
63-
| [ibm_tg_gateway.tgw_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.1/docs/data-sources/tg_gateway) | data source |
61+
| [ibm_is_network_acl.management_acls_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/is_network_acl) | data source |
62+
| [ibm_is_subnet.management_subnets_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/is_subnet) | data source |
63+
| [ibm_tg_gateway.tgw_ds](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.76.2/docs/data-sources/tg_gateway) | data source |
6464

6565
### Inputs
6666

0 commit comments

Comments
 (0)