From 2201c273cfd9b1c24d6428c81ff5a66ab0f9aa5c Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 8 Dec 2025 10:37:30 -0600 Subject: [PATCH] Switch back to vanilla Neutron image for 2025.2 After the 2025.2 release we used the custom Neutron image with the critical bug fix for the Neutron DHCP agent. Now the fix is merged and we switch back to vanilla image. Change-Id: I5b202e1eac35ff5d4ef92f9984b6427ab62da6ef Signed-off-by: Vladimir Kozhukalov --- values_overrides/neutron/2025.2-ubuntu_noble.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/values_overrides/neutron/2025.2-ubuntu_noble.yaml b/values_overrides/neutron/2025.2-ubuntu_noble.yaml index 2886403954..a4a1050cb9 100644 --- a/values_overrides/neutron/2025.2-ubuntu_noble.yaml +++ b/values_overrides/neutron/2025.2-ubuntu_noble.yaml @@ -8,11 +8,7 @@ images: ks_service: "quay.io/airshipit/heat:2025.2-ubuntu_noble" ks_endpoints: "quay.io/airshipit/heat:2025.2-ubuntu_noble" neutron_db_sync: "quay.io/airshipit/neutron:2025.2-ubuntu_noble" - # neutron_dhcp: "quay.io/airshipit/neutron:2025.2-ubuntu_noble" - # FIXME: This image is built with the critical bug fix - # https://review.opendev.org/c/openstack/neutron/+/962871 - # Use vanilla image when the fix is merged and backported to 2025.2 - neutron_dhcp: "quay.io/kozhukalov/neutron:2025.2-ubuntu_noble_custom" + neutron_dhcp: "quay.io/airshipit/neutron:2025.2-ubuntu_noble" neutron_l3: "quay.io/airshipit/neutron:2025.2-ubuntu_noble" neutron_l2gw: "quay.io/airshipit/neutron:2025.2-ubuntu_noble" neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.2-ubuntu_noble"