From 0ca16fcea6b487de4d78b10ab8e76b70ed33c926 Mon Sep 17 00:00:00 2001
From: Hamdy Khader <hamdyk@mellanox.com>
Date: Thu, 17 Oct 2019 12:43:31 +0300
Subject: Add Networking-MLNX to Neutron-Base packages

The package is required for infiniband deployment to be installed
on containers: neutron-server, neutron-dhcp-agent and neutron-l3-agent.

Change-Id: I017b65c2032648fa0ac7126d4a06cd98cb7c33a0
---
 docker/neutron/neutron-base/Dockerfile.j2                          | 3 +++
 kolla/common/config.py                                             | 4 ++++
 .../add-networking-mlnx-to-neutron-base-2c39f761dbf8fa7d.yaml      | 7 +++++++
 3 files changed, 14 insertions(+)
 create mode 100644 releasenotes/notes/add-networking-mlnx-to-neutron-base-2c39f761dbf8fa7d.yaml

diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index d7f9b2a37..f3f5877d7 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -25,6 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-networking-sfc',
             'python3-networking-vmware-nsx',
             'python3-networking-baremetal',
+            'python3-networking-mlnx',
             'python3-openvswitch',
             'python3-oslo-vmware'
         ] %}
@@ -33,6 +34,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-networking-sfc',
             'python-networking-vmware-nsx',
             'python2-networking-baremetal',
+            'python2-networking-mlnx',
             'python2-openvswitch',
             'python2-oslo-vmware'
         ] %}
@@ -50,6 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'neutron-server',
             'openvswitch-switch',
             'python3-networking-sfc',
+            'python3-networking-mlnx',
             'python3-neutron-fwaas',
             'python3-openvswitch',
             'python3-oslo.vmware'
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 689631010..4ecd5e70d 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -579,6 +579,10 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/networking-generic-switch/'
                      'networking-generic-switch-${openstack_branch}.tar.gz')},
+    'neutron-base-plugin-networking-mlnx': {
+        'type': 'url',
+        'location': ('$tarballs_base/networking-mlnx/'
+                     'networking-mlnx-${openstack_branch}.tar.gz')},
     'neutron-base-plugin-networking-sfc': {
         'type': 'url',
         'location': ('$tarballs_base/networking-sfc/'
diff --git a/releasenotes/notes/add-networking-mlnx-to-neutron-base-2c39f761dbf8fa7d.yaml b/releasenotes/notes/add-networking-mlnx-to-neutron-base-2c39f761dbf8fa7d.yaml
new file mode 100644
index 000000000..0d3e8caa2
--- /dev/null
+++ b/releasenotes/notes/add-networking-mlnx-to-neutron-base-2c39f761dbf8fa7d.yaml
@@ -0,0 +1,7 @@
+---
+
+features:
+  - |
+    Add Networking-MLNX package to Neutron-Base image, the package is required
+    for infiniband deployment to be installed on containers: neutron-server,
+    neutron-dhcp-agent and neutron-l3-agent.
-- 
cgit v1.2.3