From 17982e5817ccb9e8b20d3c073805c6b9d63b90ec Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Sat, 4 Jan 2020 08:18:13 +0100
Subject: Add OVN bits to neutron-base

Currently neutron-server-ovn container does not run db setup for networking-ovn
subproject when bootstrapping - since it uses extend_start from
neutron-server (where networking-ovn is not installed).

Since OVN is being added as in-tree driver to Neutron and there is no
rationale behind supporting separate container images for neutron-server-ovn
and neutron-metadata-agent-ovn, hile networking-ovn driver uses around 1-2MB
of space - this change adds networking-ovn installation to neutron-base image
and deprecates neutron-server-ovn and neutron-metadata-agent-ovn images.

Change-Id: Ib2dbdd7e7d34f56985b7a5b2494c3b89034688cb
---
 docker/neutron/neutron-base/Dockerfile.j2                        | 9 ++++++---
 docker/neutron/neutron-server/extend_start.sh                    | 1 +
 kolla/common/config.py                                           | 4 ++++
 .../notes/deprecate-neutron-server-ovn-8aee98fc5923e886.yaml     | 7 +++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-neutron-server-ovn-8aee98fc5923e886.yaml

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index f3f5877d7..d29597119 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -22,15 +22,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
         {% if distro_python_version.startswith('3') %}
         {% set neutron_base_packages = neutron_base_packages + [
-            'python3-networking-sfc',
-            'python3-networking-vmware-nsx',
             'python3-networking-baremetal',
             'python3-networking-mlnx',
+            'python3-networking-ovn',
+            'python3-networking-sfc',
+            'python3-networking-vmware-nsx',
             'python3-openvswitch',
             'python3-oslo-vmware'
         ] %}
         {% else %}
         {% set neutron_base_packages = neutron_base_packages + [
+            'python-networking-ovn',
             'python-networking-sfc',
             'python-networking-vmware-nsx',
             'python2-networking-baremetal',
@@ -51,8 +53,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'neutron-plugin-ml2',
             'neutron-server',
             'openvswitch-switch',
-            'python3-networking-sfc',
             'python3-networking-mlnx',
+            'python3-networking-ovn',
+            'python3-networking-sfc',
             'python3-neutron-fwaas',
             'python3-openvswitch',
             'python3-oslo.vmware'
diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh
index 1a018a1b0..e3af2ef85 100644
--- a/docker/neutron/neutron-server/extend_start.sh
+++ b/docker/neutron/neutron-server/extend_start.sh
@@ -8,6 +8,7 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head
     neutron-db-manage ${OPTS} --subproject neutron-fwaas upgrade head
     neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head
+    neutron-db-manage ${OPTS} --subproject networking-ovn upgrade head
     exit 0
 fi
 
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 7ce8d26e1..29c87afa8 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -587,6 +587,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/networking-mlnx/'
                      'networking-mlnx-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-networking-ovn': {
+        'type': 'url',
+        'location': ('$tarballs_base/networking-ovn/'
+                     'networking-ovn-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
diff --git a/releasenotes/notes/deprecate-neutron-server-ovn-8aee98fc5923e886.yaml b/releasenotes/notes/deprecate-neutron-server-ovn-8aee98fc5923e886.yaml
new file mode 100644
index 000000000..721b99394
--- /dev/null
+++ b/releasenotes/notes/deprecate-neutron-server-ovn-8aee98fc5923e886.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The ``neutron-server-ovn`` and ``neutron-metadata-agent-ovn`` images are
+    deprecated and will be removed in the V cycle. OVN drivers and
+    networking-ovn-metadata-agent have been moved to ``neutron-base`` image
+    and are available in ``neutron-server`` and ``neutron-metadata-agent``.
-- 
cgit v1.2.3