Merge "Add Networking-MLNX to Neutron-Base packages"

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'

kolla/common/config.py

@@ -581,6 +581,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/'

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.