diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-27 10:54:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-27 10:54:52 +0000 |
| commit | ed07d72778bb35f15db958340d69d5a1857b271d (patch) | |
| tree | d527026fdb15a6710c82fa43c1622e5687c2e54c | |
| parent | 1781af8b46b103bc47c57a50f7992240a2dd7bad (diff) | |
| parent | a7f92df4eb045072b95ee226e642db13a36eead3 (diff) | |
| download | kolla-ed07d72778bb35f15db958340d69d5a1857b271d.tar.gz kolla-ed07d72778bb35f15db958340d69d5a1857b271d.zip | |
Merge "Remove neutron-server-ovn and neutron-ovn-metadata-agent images"
3 files changed, 6 insertions, 26 deletions
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 ef69d42cb..000000000 --- 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 c7454788b..000000000 --- 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 000000000..72fd5ce36 --- /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. |