diff --git a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 deleted file mode 100644 index ef69d42cbe..0000000000 --- a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block neutron_metadata_agent_ovn_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block neutron_metadata_agent_ovn_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2 deleted file mode 100644 index c7454788bd..0000000000 --- a/docker/neutron/neutron-server-ovn/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block neutron_server_ovn %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block neutron_server_ovn_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/releasenotes/notes/remove-neutron-server-ovn-b3c1315912ca0f94.yaml b/releasenotes/notes/remove-neutron-server-ovn-b3c1315912ca0f94.yaml new file mode 100644 index 0000000000..72fd5ce367 --- /dev/null +++ b/releasenotes/notes/remove-neutron-server-ovn-b3c1315912ca0f94.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + ``neutron-server-ovn`` and ``neutron-metadata-agent-ovn`` images have been + removed. OVN drivers have been moved into Neutron code base in Ussuri + release and ``networking-ovn`` bits are no longer required to be installed.