Honour the linuxbridge experimental status

This patch follows upstream and disables linuxbridge testing.
Users are notified of the situation via the release note.

Change-Id: I524682ceb5287c14ef0ba99baae0c081850f4c5e
This commit is contained in:
Radosław Piliszek 2022-08-03 15:19:40 +02:00
parent da214b74a9
commit 125646b911
9 changed files with 16 additions and 32 deletions

View File

@ -97,7 +97,7 @@ Kolla Ansible deploys containers for the following infrastructure components:
- `MariaDB and Galera Cluster <https://mariadb.com/kb/en/mariadb/galera-cluster/>`__
for highly available MySQL databases.
- `Memcached <https://memcached.org/>`__ a distributed memory object caching system.
- `Open vSwitch <https://openvswitch.org/>`__ and Linuxbridge backends for Neutron.
- `Open vSwitch <https://openvswitch.org/>`__ for use with Neutron.
- `RabbitMQ <https://www.rabbitmq.com/>`__ as a messaging backend for
communication between services.
- `Redis <https://redis.io/>`__ an in-memory data structure store.

View File

@ -254,6 +254,8 @@ dpdk_tunnel_interface_address: "{{ 'dpdk_tunnel' | kolla_address }}"
ironic_http_interface_address: "{{ 'ironic_http' | kolla_address }}"
# Valid options are [ openvswitch, ovn, linuxbridge, vmware_nsxv, vmware_nsxv3, vmware_nsxp, vmware_dvs ]
# Do note linuxbridge is *EXPERIMENTAL* in Neutron since Zed and it requires extra tweaks to config to be usable.
# For details, see: https://docs.openstack.org/neutron/latest/admin/config-experimental-framework.html
neutron_plugin_agent: "openvswitch"
# Valid options are [ internal, infoblox ]

View File

@ -147,6 +147,8 @@ workaround_ansible_issue_8743: yes
# Valid options are [ openvswitch, ovn, linuxbridge, vmware_nsxv, vmware_nsxv3, vmware_nsxp, vmware_dvs ]
# if vmware_nsxv3 or vmware_nsxp is selected, enable_openvswitch MUST be set to "no" (default is yes)
# Do note linuxbridge is *EXPERIMENTAL* in Neutron since Zed and it requires extra tweaks to config to be usable.
# For details, see: https://docs.openstack.org/neutron/latest/admin/config-experimental-framework.html
#neutron_plugin_agent: "openvswitch"
# Valid options are [ internal, infoblox ]

View File

@ -0,0 +1,10 @@
---
upgrade:
- |
Starting with Zed, Neutron marked the ``linuxbridge`` ML2 driver
experimental. The Kolla team has decided to honour the upstream's
decision and make sure users are aware they are using a badly
supported driver instead of having it configured out of the box.
Thus, all users of this driver are advised to get acquainted with
`Neutron docs <https://docs.openstack.org/neutron/latest/admin/config-experimental-framework.html>`__
and proceed accordingly.

View File

@ -21,7 +21,7 @@
need_build_image: false
build_image_tag: "change_{{ zuul.change | default('none') }}"
openstack_core_enabled: "{{ openstack_core_enabled }}"
openstack_core_tested: "{{ scenario in ['core', 'cephadm', 'zun', 'cells', 'swift', 'linuxbridge', 'ovn'] }}"
openstack_core_tested: "{{ scenario in ['core', 'cephadm', 'zun', 'cells', 'swift', 'ovn'] }}"
dashboard_enabled: "{{ openstack_core_enabled or scenario in ['monasca'] }}"
upper_constraints_file: "{{ ansible_env.HOME }}/src/opendev.org/openstack/requirements/upper-constraints.txt"
docker_image_tag_suffix: "{{ '-aarch64' if ansible_architecture == 'aarch64' else '' }}"

View File

@ -151,10 +151,6 @@ rabbitmq_enable_tls: "yes"
libvirt_tls: "yes"
{% endif %}
{% if scenario == 'linuxbridge' %}
neutron_plugin_agent: "linuxbridge"
{% endif %}
{% if scenario == "ovn" %}
neutron_plugin_agent: "ovn"
neutron_ovn_distributed_fip: "yes"

View File

@ -201,16 +201,6 @@
vars:
scenario: cells
- job:
name: kolla-ansible-linuxbridge-base
parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/neutron/
- ^tests/test-core-openstack.sh
vars:
scenario: linuxbridge
- job:
name: kolla-ansible-ovn-base
parent: kolla-ansible-base

View File

@ -350,20 +350,6 @@
vars:
base_distro: centos
- job:
name: kolla-ansible-ubuntu-source-linuxbridge
parent: kolla-ansible-linuxbridge-base
nodeset: kolla-ansible-jammy
vars:
base_distro: ubuntu
- job:
name: kolla-ansible-centos8s-source-linuxbridge
parent: kolla-ansible-linuxbridge-base
nodeset: kolla-ansible-centos8s
vars:
base_distro: centos
- job:
name: kolla-ansible-centos8s-source-ovn
parent: kolla-ansible-ovn-base

View File

@ -44,8 +44,6 @@
# - kolla-ansible-centos8s-source-cells
# - kolla-ansible-centos8s-source-mariadb
- kolla-ansible-ubuntu-source-mariadb
# - kolla-ansible-centos8s-source-linuxbridge
- kolla-ansible-ubuntu-source-linuxbridge
# - kolla-ansible-centos8s-source-ovn
- kolla-ansible-ubuntu-source-ovn
# - kolla-ansible-centos8s-source-upgrade-ovn