From 701ab493bd8c53bfcc2298ec831e0985aee7c7aa Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 16 May 2026 23:58:22 +0900 Subject: Remove support for networking-infoblox The project[1] has received no commit for 4 years. Its latest commit still uses upper constraints from the old, abandoned Wallaby branch. [1] https://opendev.org/x/networking-infoblox Depends-on: https://review.opendev.org/c/openstack/kolla-ansible/+/988844 Change-Id: I9e2ba00671eb7d05de3c40ed9524f20922e081b1 Signed-off-by: Takashi Kajinami --- .../neutron-infoblox-ipam-agent/Dockerfile.j2 | 20 -------------------- .../remove-networking-infoblox-d2819f908d7d2b54.yaml | 4 ++++ roles/kolla-build-config/defaults/main.yml | 1 - 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 create mode 100644 releasenotes/notes/remove-networking-infoblox-d2819f908d7d2b54.yaml diff --git a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 deleted file mode 100644 index a27b7cdd0..000000000 --- a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 +++ /dev/null @@ -1,20 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -# This image inherits from neutron-server image, which is also a leaf image, -# and therefore sets the user to neutron. Set the user to root, so that any -# headers or footers used have the right context. -USER root - -{% block neutron_infoblox_ipam_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_infoblox_ipam_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/releasenotes/notes/remove-networking-infoblox-d2819f908d7d2b54.yaml b/releasenotes/notes/remove-networking-infoblox-d2819f908d7d2b54.yaml new file mode 100644 index 000000000..2fb77a185 --- /dev/null +++ b/releasenotes/notes/remove-networking-infoblox-d2819f908d7d2b54.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``neutron-infoblox-ipam-agent`` image has been removed. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 0306bb0cf..f00b61190 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -41,7 +41,6 @@ kolla_build_sources: openstack/neutron-dynamic-routing: - neutron-bgp-dragent - neutron-server-plugin-neutron-dynamic-routing - openstack/networking-infoblox: neutron-server-plugin-networking-infoblox openstack/networking-generic-switch: neutron-base-plugin-networking-generic-switch openstack/networking-sfc: - neutron-base-plugin-networking-sfc -- cgit v1.2.3