From 2f00cbe54a772715e55492cc088a5c6ec60a22a6 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 3 Apr 2020 14:12:49 +0200
Subject: [PATCH] octavia: Add ovn-octavia-driver

During this cycle Neutron team merged networking-ovn code to Neutron.
As a consequence of it "OVN Octavia provider" project has been created.
Before it the driver was placed in networking-ovn tree.

Change-Id: I0dcd34b5e2c096557f0485aaec83d344e5cb01bb
---
 docker/octavia/octavia-api/Dockerfile.j2 | 26 +++++++++++++++++++++---
 kolla/common/config.py                   |  4 ++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/docker/octavia/octavia-api/Dockerfile.j2 b/docker/octavia/octavia-api/Dockerfile.j2
index 3420c2eb97..e5b4dcf550 100644
--- a/docker/octavia/octavia-api/Dockerfile.j2
+++ b/docker/octavia/octavia-api/Dockerfile.j2
@@ -13,14 +13,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'httpd',
             'mod_ssl',
             'openstack-octavia-api',
-            'python3-mod_wsgi'
+            'python3-mod_wsgi',
+            'python3-ovn-octavia-provider'
         ] %}
     {% elif base_package_type == 'deb' %}
         {% set octavia_api_packages = [
-            'octavia-api',
             'apache2',
-            'libapache2-mod-wsgi-py3'
+            'libapache2-mod-wsgi-py3',
+            'octavia-api',
         ] %}
+
+        {% if base_distro == 'debian' %}
+            {% set octavia_api_packages = octavia_api_packages + [
+                'python3-networking-ovn'
+            ] %}
+        {% elif base_distro == 'ubuntu' %}
+            {% set octavia_api_packages = octavia_api_packages + [
+                'python3-ovn-octavia-provider'
+            ] %}
+        {% endif %}
+
     {% endif %}
 
 {% elif install_type == 'source' %}
@@ -38,6 +50,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
     {% endif %}
 
+    {% set octavia_api_plugins_pip_packages = [
+        '/plugins/*'
+    ] %}
+
+ADD plugins-archive /
+RUN if [ "$(ls /plugins)" ]; then \
+        {{ macros.install_pip(octavia_api_plugins_pip_packages) }} ; \
+    fi
 {% endif %}
 
 {{ macros.install_packages(octavia_api_packages | customizable("packages")) }}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 9b3730b245..0cfdcad9a3 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -644,6 +644,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/octavia/'
                      'octavia-6.0.0.tar.gz')},
+    'octavia-api-plugin-ovn-octavia-provider': {
+        'type': 'url',
+        'location': ('$tarballs_base/ovn-octavia-provider/'
+                     'ovn-octavia-provider-${openstack_branch}.tar.gz')},
     'panko-base': {
         'type': 'url',
         'location': ('$tarballs_base/panko/'