From 125646b9117ec11ae9680013c6850fe79b28b33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Wed, 3 Aug 2022 15:19:40 +0200 Subject: [PATCH] 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 --- README.rst | 2 +- ansible/group_vars/all.yml | 2 ++ etc/kolla/globals.yml | 2 ++ ...s-experimental-in-neutron-8a12590100e47710.yaml | 10 ++++++++++ tests/run.yml | 2 +- tests/templates/globals-default.j2 | 4 ---- zuul.d/base.yaml | 10 ---------- zuul.d/jobs.yaml | 14 -------------- zuul.d/project.yaml | 2 -- 9 files changed, 16 insertions(+), 32 deletions(-) create mode 100644 releasenotes/notes/linuxbridge-is-experimental-in-neutron-8a12590100e47710.yaml diff --git a/README.rst b/README.rst index fdd1e1293e..d3f56185eb 100644 --- a/README.rst +++ b/README.rst @@ -97,7 +97,7 @@ Kolla Ansible deploys containers for the following infrastructure components: - `MariaDB and Galera Cluster `__ for highly available MySQL databases. - `Memcached `__ a distributed memory object caching system. -- `Open vSwitch `__ and Linuxbridge backends for Neutron. +- `Open vSwitch `__ for use with Neutron. - `RabbitMQ `__ as a messaging backend for communication between services. - `Redis `__ an in-memory data structure store. diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index f472a9d922..acd3dfcdd9 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -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 ] diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index e5cc45e682..1f8f7a9f20 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -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 ] diff --git a/releasenotes/notes/linuxbridge-is-experimental-in-neutron-8a12590100e47710.yaml b/releasenotes/notes/linuxbridge-is-experimental-in-neutron-8a12590100e47710.yaml new file mode 100644 index 0000000000..1587a9ed80 --- /dev/null +++ b/releasenotes/notes/linuxbridge-is-experimental-in-neutron-8a12590100e47710.yaml @@ -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 `__ + and proceed accordingly. diff --git a/tests/run.yml b/tests/run.yml index bc66401f48..f5e8e8833a 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -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 '' }}" diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 3e08e2df29..139d2e838d 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -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" diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 3f551cdea2..d0517b8adc 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -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 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 32b8a900ee..7f654b37d3 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 41813cc397..1fdc0e65ca 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -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