From ce4c2ff5d4a0e006232aea4e669c88b9944720d2 Mon Sep 17 00:00:00 2001 From: Vladimir Kozhukalov Date: Mon, 28 Apr 2025 10:01:15 -0500 Subject: [PATCH] Use vanilla Neutron 2025.1 images This was a temporary workaround until this is merged https://review.opendev.org/c/openstack/neutron/+/946877 Change-Id: Icc49a03b4b2b9e209658cc2f1d0f9b8b8012e347 --- values_overrides/neutron/2025.1-ubuntu_jammy.yaml | 4 +--- values_overrides/neutron/2025.1-ubuntu_noble.yaml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/values_overrides/neutron/2025.1-ubuntu_jammy.yaml b/values_overrides/neutron/2025.1-ubuntu_jammy.yaml index c62b8076c6..a17883e9e7 100644 --- a/values_overrides/neutron/2025.1-ubuntu_jammy.yaml +++ b/values_overrides/neutron/2025.1-ubuntu_jammy.yaml @@ -12,9 +12,7 @@ images: neutron_l3: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" neutron_l2gw: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" - # TODO: Use plain neutron image after https://review.opendev.org/c/openstack/neutron/+/946877 - # is merged to the stable/2025.1 branch - neutron_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy-custom" + neutron_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" neutron_ovn_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" neutron_openvswitch_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" neutron_server: "quay.io/airshipit/neutron:2025.1-ubuntu_jammy" diff --git a/values_overrides/neutron/2025.1-ubuntu_noble.yaml b/values_overrides/neutron/2025.1-ubuntu_noble.yaml index 07679285f5..3cb2f1c263 100644 --- a/values_overrides/neutron/2025.1-ubuntu_noble.yaml +++ b/values_overrides/neutron/2025.1-ubuntu_noble.yaml @@ -12,9 +12,7 @@ images: neutron_l3: "quay.io/airshipit/neutron:2025.1-ubuntu_noble" neutron_l2gw: "quay.io/airshipit/neutron:2025.1-ubuntu_noble" neutron_linuxbridge_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_noble" - # TODO: Use plain neutron image after https://review.opendev.org/c/openstack/neutron/+/946877 - # is merged to the stable/2025.1 branch - neutron_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble-custom" + neutron_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble" neutron_ovn_metadata: "quay.io/airshipit/neutron:2025.1-ubuntu_noble" neutron_openvswitch_agent: "quay.io/airshipit/neutron:2025.1-ubuntu_noble" neutron_server: "quay.io/airshipit/neutron:2025.1-ubuntu_noble"