From 422e7366ece34219bafedc33c542ea17514f5346 Mon Sep 17 00:00:00 2001 From: Joshua N Haupt Date: Tue, 3 Feb 2026 23:38:26 -0600 Subject: [PATCH] Fix Gluster image_id and update openstack_blockstorage_volume_v3 (#12910) This fixes the Terraform Gluster Compute image_id bug and updates the openstack_blockstorage_volume_v2 to openstack_blockstorage_volume_v3. Resolves: [Bug] OpenStack Compute variable handling of image_id and image_name for Gluster nodes is broken https://github.com/kubernetes-sigs/kubespray/issues/12902 Update openstack_blockstorage_volume_v2 to openstack_blockstorage_volume_v3 https://github.com/kubernetes-sigs/kubespray/issues/12901 Signed-off-by: Joshua Nathaniel Haupt --- contrib/terraform/openstack/modules/compute/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/terraform/openstack/modules/compute/main.tf b/contrib/terraform/openstack/modules/compute/main.tf index 2256ea2b4..8e02e8da7 100644 --- a/contrib/terraform/openstack/modules/compute/main.tf +++ b/contrib/terraform/openstack/modules/compute/main.tf @@ -1006,7 +1006,7 @@ resource "openstack_compute_instance_v2" "glusterfs_node_no_floating_ip" { name = "${var.cluster_name}-gfs-node-nf-${count.index + 1}" count = var.number_of_gfs_nodes_no_floating_ip availability_zone = element(var.az_list, count.index) - image_name = var.gfs_root_volume_size_in_gb == 0 ? local.image_to_use_gfs : null + image_id = var.gfs_root_volume_size_in_gb == 0 ? local.image_to_use_gfs : null flavor_id = var.flavor_gfs_node key_pair = openstack_compute_keypair_v2.k8s.name @@ -1078,7 +1078,7 @@ resource "openstack_networking_floatingip_associate_v2" "k8s_nodes" { port_id = openstack_networking_port_v2.k8s_nodes_port[each.key].id } -resource "openstack_blockstorage_volume_v2" "glusterfs_volume" { +resource "openstack_blockstorage_volume_v3" "glusterfs_volume" { name = "${var.cluster_name}-glusterfs_volume-${count.index + 1}" count = var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0 description = "Non-ephemeral volume for GlusterFS" @@ -1088,5 +1088,5 @@ resource "openstack_blockstorage_volume_v2" "glusterfs_volume" { resource "openstack_compute_volume_attach_v2" "glusterfs_volume" { count = var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0 instance_id = element(openstack_compute_instance_v2.glusterfs_node_no_floating_ip.*.id, count.index) - volume_id = element(openstack_blockstorage_volume_v2.glusterfs_volume.*.id, count.index) + volume_id = element(openstack_blockstorage_volume_v3.glusterfs_volume.*.id, count.index) }