summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2020-07-23 12:40:03 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2020-07-23 13:16:49 +0200
commita7f92df4eb045072b95ee226e642db13a36eead3 (patch)
treee92f549139e2df7cbc1c651fee4603ea42e6a37e
parentacd0d4bf20e3b103c9a519f0f013bc9dbd67d973 (diff)
downloadkolla-a7f92df4eb045072b95ee226e642db13a36eead3.tar.gz
kolla-a7f92df4eb045072b95ee226e642db13a36eead3.zip
Remove neutron-server-ovn and neutron-ovn-metadata-agent images
Those have been deprecated in previous cycle - see [1]. [1]: https://review.opendev.org/#/c/701074/ Change-Id: Ifde221e807df75d884a3f8cc4fc29eb0cb303472
-rw-r--r--docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j213
-rw-r--r--docker/neutron/neutron-server-ovn/Dockerfile.j213
-rw-r--r--releasenotes/notes/remove-neutron-server-ovn-b3c1315912ca0f94.yaml6
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.