diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-13 10:47:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-13 10:47:58 +0000 |
| commit | 69e1118c4f9f4cf945db6da1dffe1ab22cc1cfbe (patch) | |
| tree | 92bbbcd3d4fe93735961aaa6b1cd96d8cf9cee0c | |
| parent | e946ef652fe0bda062c14f6cea106896ea9fe287 (diff) | |
| parent | 0ca16fcea6b487de4d78b10ab8e76b70ed33c926 (diff) | |
| download | kolla-69e1118c4f9f4cf945db6da1dffe1ab22cc1cfbe.tar.gz kolla-69e1118c4f9f4cf945db6da1dffe1ab22cc1cfbe.zip | |
Merge "Add Networking-MLNX to Neutron-Base packages"
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 3 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/add-networking-mlnx-to-neutron-base-2c39f761dbf8fa7d.yaml | 7 |
3 files changed, 14 insertions, 0 deletions
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 6b5302f46..f713c29c8 100755 --- a/kolla/common/config.py +++ b/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/' 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. |