openstack/kolla
Code Issues Proposed changes

neutron: Remove vmware-nsx and networking-mlx from binary

Browse Source 
Those plugins have been already removed from source images, this
change removes them from binary.

Change-Id: If21a21296489c1f243bb46f2595ff94d999bd686
This commit is contained in:
Michał Nasiadka 2021-04-27 17:23:26 +02:00
parent edc14536d0
commit a4f6a8f05b
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/neutron-plugins/README.rst
View File

@ -3,7 +3,10 @@ contrib/neutron-plugins directory
This directory contains example plugin definitions for neutron-base, to This directory contains example plugin definitions for neutron-base, to
be included in the kolla-build.conf (ini file with kolla-build be included in the kolla-build.conf (ini file with kolla-build
configuration). configuration) when using source type builds.
In case of binary builds - please see template_override j2 files.
Please read the main Kolla documentation on plugins for details. Please read the main Kolla documentation on plugins for details.
These should work simply by pasting them into the config file. These should work simply by pasting them into the config file.
You may want to adjust the filename to match the branch you are You may want to adjust the filename to match the branch you are

4
contrib/neutron-plugins/template_override-networking-mlnx.j2 Normal file
View File

@ -0,0 +1,4 @@
{% extends parent_template %}
# Neutron networking-mlnx plugin
{% set neutron_base_packages_append = ['python3-networking-mlnx'] %}

4
contrib/neutron-plugins/template_override-vmware-nsx.j2 Normal file
View File

@ -0,0 +1,4 @@
{% extends parent_template %}
# Neutron vmware-nsx plugin
{% set neutron_base_packages_append = ['python3-networking-vmware-nsx'] %}

3
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -22,9 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-neutron-ml2', 'openstack-neutron-ml2',
'openvswitch', 'openvswitch',
'python3-networking-baremetal', 'python3-networking-baremetal',
'python3-networking-mlnx',
'python3-networking-sfc', 'python3-networking-sfc',
'python3-networking-vmware-nsx',
'python3-openvswitch', 'python3-openvswitch',
'python3-oslo-vmware' 'python3-oslo-vmware'
] %} ] %}
@ -40,7 +38,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'neutron-plugin-ml2', 'neutron-plugin-ml2',
'neutron-server', 'neutron-server',
'openvswitch-switch', 'openvswitch-switch',
'python3-networking-mlnx',
'python3-networking-sfc', 'python3-networking-sfc',
'python3-openvswitch', 'python3-openvswitch',
'python3-oslo.vmware' 'python3-oslo.vmware'

5
releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml
View File

@ -1,7 +1,7 @@
--- ---
upgrade: upgrade:
- | - |
Three Neutron plugins are no longer provided by default in source Three Neutron plugins are no longer provided by default in
images: images:
``networking-ansible``, ``networking-mlnx`` and ``vmware-nsx``. ``networking-ansible``, ``networking-mlnx`` and ``vmware-nsx``.
The main reason is that they lag in synchronising with OpenStack The main reason is that they lag in synchronising with OpenStack
@ -10,5 +10,4 @@ upgrade:
directory. directory.
Please read the included ``README.rst`` in case you depend on Please read the included ``README.rst`` in case you depend on
them. them.
Please note they are no longer included in published source Please note they are no longer included in published images.
images.