diff options
| author | Zuul <zuul@review.opendev.org> | 2026-05-27 09:59:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-05-27 09:59:12 +0000 |
| commit | 43f890c3fed0ba1aa3a80fe8d79a8bc525e3fd81 (patch) | |
| tree | d54b8ce0f248148306088af3469c694a6f155cd4 | |
| parent | 2a43eeebc8968a5683a5964ae585035658884080 (diff) | |
| parent | 701ab493bd8c53bfcc2298ec831e0985aee7c7aa (diff) | |
| download | kolla-43f890c3fed0ba1aa3a80fe8d79a8bc525e3fd81.tar.gz kolla-43f890c3fed0ba1aa3a80fe8d79a8bc525e3fd81.zip | |
Merge "Remove support for networking-infoblox"
3 files changed, 4 insertions, 21 deletions
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 |