diff --git a/contrib/neutron-plugins/README.rst b/contrib/neutron-plugins/README.rst new file mode 100644 index 0000000000..2dc42165d3 --- /dev/null +++ b/contrib/neutron-plugins/README.rst @@ -0,0 +1,10 @@ +contrib/neutron-plugins directory +================================= + +This directory contains example plugin definitions for neutron-base, to +be included in the kolla-build.conf (ini file with kolla-build +configuration). +Please read the main Kolla documentation on plugins for details. +These should work simply by pasting them into the config file. +You may want to adjust the filename to match the branch you are +interested in, however. diff --git a/contrib/neutron-plugins/networking-ansible.ini b/contrib/neutron-plugins/networking-ansible.ini new file mode 100644 index 0000000000..cfd096f523 --- /dev/null +++ b/contrib/neutron-plugins/networking-ansible.ini @@ -0,0 +1,3 @@ +[neutron-base-plugin-networking-ansible] +type = url +location = https://tarballs.opendev.org/x/networking-ansible/networking-ansible-master.tar.gz diff --git a/contrib/neutron-plugins/networking-mlnx.ini b/contrib/neutron-plugins/networking-mlnx.ini new file mode 100644 index 0000000000..f8a16ef630 --- /dev/null +++ b/contrib/neutron-plugins/networking-mlnx.ini @@ -0,0 +1,3 @@ +[neutron-base-plugin-networking-mlnx] +type = url +location = https://tarballs.opendev.org/x/networking-mlnx/networking-mlnx-master.tar.gz diff --git a/contrib/neutron-plugins/vmware-nsx.ini b/contrib/neutron-plugins/vmware-nsx.ini new file mode 100644 index 0000000000..696bc91614 --- /dev/null +++ b/contrib/neutron-plugins/vmware-nsx.ini @@ -0,0 +1,3 @@ +[neutron-base-plugin-vmware-nsx] +type = url +location = https://tarballs.opendev.org/x/vmware-nsx/vmware-nsx-master.tar.gz diff --git a/kolla/common/config.py b/kolla/common/config.py index 9092b0b775..c1c672577f 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -33,7 +33,7 @@ DISTRO_RELEASE = { 'debian': '10', 'ubuntu': '20.04', } -OPENSTACK_RELEASE = 'master' +OPENSTACK_RELEASE = 'wallaby' # This is noarch repository so we will use it on all architectures DELOREAN = "https://trunk.rdoproject.org/centos8-master/" \ @@ -517,10 +517,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/neutron/' 'neutron-${openstack_branch}.tar.gz')}, - 'neutron-base-plugin-networking-ansible': { - 'type': 'url', - 'location': ('$tarballs_base/x/networking-ansible/' - 'networking-ansible-${openstack_branch}.tar.gz')}, 'neutron-base-plugin-networking-baremetal': { 'type': 'url', 'location': ('$tarballs_base/openstack/networking-baremetal/' @@ -529,18 +525,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/networking-generic-switch/' 'networking-generic-switch-${openstack_branch}.tar.gz')}, - 'neutron-base-plugin-networking-mlnx': { - 'type': 'url', - 'location': ('$tarballs_base/x/networking-mlnx/' - 'networking-mlnx-${openstack_branch}.tar.gz')}, 'neutron-base-plugin-networking-sfc': { 'type': 'url', 'location': ('$tarballs_base/openstack/networking-sfc/' 'networking-sfc-${openstack_branch}.tar.gz')}, - 'neutron-base-plugin-vmware-nsx': { - 'type': 'url', - 'location': ('$tarballs_base/x/vmware-nsx/' - 'vmware-nsx-${openstack_branch}.tar.gz')}, 'neutron-base-plugin-vpnaas-agent': { 'type': 'url', 'location': ('$tarballs_base/openstack/neutron-vpnaas/' diff --git a/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml b/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml new file mode 100644 index 0000000000..6f049dfaaf --- /dev/null +++ b/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml @@ -0,0 +1,12 @@ +--- +upgrade: + - | + Three Neutron plugins are no longer provided by default: + ``networking-ansible``, ``networking-mlnx`` and ``vmware-nsx``. + The main reason is that they lag in synchronising with OpenStack + release process. + Their definitions have been moved to ``contrib/neutron-plugins`` + directory. + Please read the included ``README.rst`` in case you depend on + them. + Please note they are no longer included in published images. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 1cbde01dc5..24701912ca 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -53,8 +53,6 @@ kolla_build_sources: openstack/networking-sfc: - neutron-base-plugin-networking-sfc - tacker-base-plugin-networking-sfc - openstack/vmware-nsx: neutron-base-plugin-vmware-nsx - openstack/vmware-nsxlib: neutron-server-plugin-vmware-nsxlib openstack/neutron-vpnaas: - neutron-vpnaas-agent - neutron-base-plugin-vpnaas-agent diff --git a/tools/version-check.py b/tools/version-check.py index 2777c0af0d..d200ffdc1b 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -42,10 +42,6 @@ TARGET = '.releases' SKIP_PROJECTS = { 'gnocchi-base': 'Gnocchi is not managed by openstack/releases project', 'monasca-thresh': 'Package not published in tarballs.openstack.org', - 'neutron-base-plugin-vmware-nsx': 'vmware-nsx is not managed by ' - 'openstack/releases project (need to ' - 'check PyPI, they sync major versions ' - 'with neutron)', 'rally': 'Rally is not managed by openstack/releases project', }