From c721f9b8aff3bfce07e7ac40e8eaa2b4f74d0bf9 Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Fri, 31 Oct 2025 12:03:33 +0100 Subject: [PATCH 1/2] fix: wrong suffix and revert workspace to 4.0.0 --- modules/powervs-vpc-landing-zone/README.md | 2 +- modules/powervs-vpc-landing-zone/powervs-ws.tf | 2 +- solutions/standard-plus-vsi/locals.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/powervs-vpc-landing-zone/README.md b/modules/powervs-vpc-landing-zone/README.md index dc70f922..8f8e553b 100644 --- a/modules/powervs-vpc-landing-zone/README.md +++ b/modules/powervs-vpc-landing-zone/README.md @@ -114,7 +114,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 | 8.8.0 | -| [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 4.0.8 | +| [powervs\_workspace](#module\_powervs\_workspace) | terraform-ibm-modules/powervs-workspace/ibm | 4.0.0 | | [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.10.2 | | [scc\_wp\_instance](#module\_scc\_wp\_instance) | terraform-ibm-modules/scc-workload-protection/ibm | 1.14.2 | | [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.15 | diff --git a/modules/powervs-vpc-landing-zone/powervs-ws.tf b/modules/powervs-vpc-landing-zone/powervs-ws.tf index 67ce05fe..e650588e 100644 --- a/modules/powervs-vpc-landing-zone/powervs-ws.tf +++ b/modules/powervs-vpc-landing-zone/powervs-ws.tf @@ -27,7 +27,7 @@ locals { module "powervs_workspace" { source = "terraform-ibm-modules/powervs-workspace/ibm" - version = "4.0.8" + version = "4.0.0" providers = { ibm = ibm.ibm-pi } diff --git a/solutions/standard-plus-vsi/locals.tf b/solutions/standard-plus-vsi/locals.tf index d42e2275..cb124605 100644 --- a/solutions/standard-plus-vsi/locals.tf +++ b/solutions/standard-plus-vsi/locals.tf @@ -97,7 +97,7 @@ locals { } network_services_config = { - squid = { enable = true, squid_server_ip_port = module.standard.proxy_host_or_ip_port, no_proxy_hosts = "161.0.0.0/0,${var.vpc_subnet_cidrs.vpn},${var.vpc_subnet_cidrs.mgmt},${var.vpc_subnet_cidrs.vpe},${var.vpc_subnet_cidrs.edge},${var.powervs_management_network != null ? "${var.powervs_management_network.cidr}," : ""}${var.powervs_backup_network != null ? "${var.powervs_backup_network.cidr}," : ""}${var.client_to_site_vpn.client_ip_pool}" } + squid = { enable = true, squid_server_ip_port = module.standard.proxy_host_or_ip_port, no_proxy_hosts = "161.0.0.0/8,${var.vpc_subnet_cidrs.vpn},${var.vpc_subnet_cidrs.mgmt},${var.vpc_subnet_cidrs.vpe},${var.vpc_subnet_cidrs.edge},${var.powervs_management_network != null ? "${var.powervs_management_network.cidr}," : ""}${var.powervs_backup_network != null ? "${var.powervs_backup_network.cidr}," : ""}${var.client_to_site_vpn.client_ip_pool}" } nfs = { enable = var.configure_nfs_server, nfs_server_path = module.standard.nfs_host_or_ip_path, nfs_client_path = lookup(var.nfs_server_config, "mount_path", ""), opts = "sec=sys,nfsvers=4.1,nofail", fstype = "nfs4" } dns = { enable = var.configure_dns_forwarder, dns_server_ip = module.standard.dns_host_or_ip } ntp = { enable = var.configure_ntp_forwarder, ntp_server_ip = module.standard.ntp_host_or_ip } From 01e5e213d4a235a8a35acb963bc7c4c7e5bfc08e Mon Sep 17 00:00:00 2001 From: ludwig-mueller Date: Fri, 31 Oct 2025 15:52:09 +0100 Subject: [PATCH 2/2] SKIP UPGRADE TEST