From 2f7df169970ffd83cfbe1b5f334f7e7e6f7ecb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <mdulko@redhat.com>
Date: Wed, 6 Jul 2022 12:55:17 +0200
Subject: [PATCH] Disable linuxbridge on the OVS gates
For some reason linuxbridge was set as mechanism driver in OVS gates.
This commit disables that as linuxbridge became experimental in Neutron
and gates fail.
Change-Id: I2dd5c7f19af73badae49d2509efb0016335e6c9e
---
.zuul.d/base.yaml | 2 +-
.zuul.d/tempest-multinode-jobs.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 68423709b..f36e6059f 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -164,7 +164,7 @@
KURYR_ENFORCE_SG_RULES: true
ML2_L3_PLUGIN: router
Q_AGENT: openvswitch
- Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
+ Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
zuul_copy_output:
'{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
diff --git a/.zuul.d/tempest-multinode-jobs.yaml b/.zuul.d/tempest-multinode-jobs.yaml
index d8d0c14f1..dba7a3c0f 100644
--- a/.zuul.d/tempest-multinode-jobs.yaml
+++ b/.zuul.d/tempest-multinode-jobs.yaml
@@ -133,7 +133,7 @@
KURYR_SUBNET_DRIVER: namespace
ML2_L3_PLUGIN: router
Q_AGENT: openvswitch
- Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
+ Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
vars:
tempest_test_regex: '^(kuryr_tempest_plugin.tests.scenario.test_cross_ping_multi_worker.TestCrossPingScenarioMultiWorker)'