Browse Source

[release] Use Wallaby sources by default

Removes 3 Neutron plugins from the default config to build.

Change-Id: Ib32cfe4bacbfb2ccd526b62846b8d89c06506d02
changes/00/785500/4
Radosław Piliszek 4 weeks ago
parent
commit
c96a4316b3
8 changed files with 32 additions and 19 deletions
  1. +10
    -0
      contrib/neutron-plugins/README.rst
  2. +3
    -0
      contrib/neutron-plugins/networking-ansible.ini
  3. +3
    -0
      contrib/neutron-plugins/networking-mlnx.ini
  4. +3
    -0
      contrib/neutron-plugins/vmware-nsx.ini
  5. +1
    -13
      kolla/common/config.py
  6. +12
    -0
      releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml
  7. +0
    -2
      roles/kolla-build-config/defaults/main.yml
  8. +0
    -4
      tools/version-check.py

+ 10
- 0
contrib/neutron-plugins/README.rst View File

@ -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.

+ 3
- 0
contrib/neutron-plugins/networking-ansible.ini View File

@ -0,0 +1,3 @@
[neutron-base-plugin-networking-ansible]
type = url
location = https://tarballs.opendev.org/x/networking-ansible/networking-ansible-master.tar.gz

+ 3
- 0
contrib/neutron-plugins/networking-mlnx.ini View File

@ -0,0 +1,3 @@
[neutron-base-plugin-networking-mlnx]
type = url
location = https://tarballs.opendev.org/x/networking-mlnx/networking-mlnx-master.tar.gz

+ 3
- 0
contrib/neutron-plugins/vmware-nsx.ini View File

@ -0,0 +1,3 @@
[neutron-base-plugin-vmware-nsx]
type = url
location = https://tarballs.opendev.org/x/vmware-nsx/vmware-nsx-master.tar.gz

+ 1
- 13
kolla/common/config.py View File

@ -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/'


+ 12
- 0
releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml View File

@ -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.

+ 0
- 2
roles/kolla-build-config/defaults/main.yml View File

@ -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


+ 0
- 4
tools/version-check.py View File

@ -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',
}


Loading…
Cancel
Save