From b5a322ea35d7acb187ac5fa31a8f9224962f4ad5 Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Mon, 3 Jul 2017 21:50:30 +0530
Subject: Add OVN specific neutron-server container

This patch creates a specific OVN neutron-server container
which uses neutron-server as its base and adds OVN specific
packages similar to this commit [1] which adds ODL specific
neutron-server

[1] - I610b07a3c2bcf1c3288f76112a08b81c50e06913

Change-Id: Iee1d04d08609e4492a7a799b5ac9c0991898887d
Partially-implements: blueprint ovn-controller-neutron
---
 docker/neutron/neutron-server-ovn/Dockerfile.j2    | 32 ++++++++++++++++++++++
 kolla/common/config.py                             |  4 +++
 .../add-neutron-server-ovn-5728bbd35b08083e.yaml   |  3 ++
 3 files changed, 39 insertions(+)
 create mode 100644 docker/neutron/neutron-server-ovn/Dockerfile.j2
 create mode 100644 releasenotes/notes/add-neutron-server-ovn-5728bbd35b08083e.yaml

diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2
new file mode 100644
index 000000000..ed51650ad
--- /dev/null
+++ b/docker/neutron/neutron-server-ovn/Dockerfile.j2
@@ -0,0 +1,32 @@
+FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+USER root
+
+{% block neutron_server_ovn %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if install_type == 'binary' %}
+    {% set neutron_server_ovn_packages = [
+        'python-networking-ovn',
+    ] %}
+
+{{ macros.install_packages(neutron_server_ovn_packages | customizable("packages")) }}
+
+{% elif install_type == 'source' %}
+
+ADD plugins-archive /
+
+{% set neutron_server_ovn_plugins_pip_packages = [
+    '/plugins/*'
+] %}
+
+RUN {{ macros.install_pip(neutron_server_ovn_plugins_pip_packages | customizable("pip_packages")) }}
+
+{% endif %}
+
+{% block neutron_server_ovn_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER neutron
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 5b14ea15a..20f1965a6 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -548,6 +548,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/neutron-vpnaas/'
                      'neutron-vpnaas-master.tar.gz')},
+    'neutron-server-ovn-plugin-networking-ovn': {
+        'type': 'url',
+        'location': ('$tarballs_base/networking-ovn/'
+                     'networking-ovn-master.tar.gz')},
     'nova-base': {
         'type': 'url',
         'location': ('$tarballs_base/nova/'
diff --git a/releasenotes/notes/add-neutron-server-ovn-5728bbd35b08083e.yaml b/releasenotes/notes/add-neutron-server-ovn-5728bbd35b08083e.yaml
new file mode 100644
index 000000000..bae9cc573
--- /dev/null
+++ b/releasenotes/notes/add-neutron-server-ovn-5728bbd35b08083e.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds OVN specific Neutron Server container.
-- 
cgit v1.2.3