From ff1c6936b874dfcf675af62bead6dde07f8076a6 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Tue, 19 Jul 2022 11:03:37 +0200 Subject: [PATCH] Remove linuxbridge mech driver from the ovs based jobs Change-Id: I76e2b2c6f2ece72143233043be19ac2cee67303b --- zuul.d/tempest-multinode.yaml | 2 +- zuul.d/tempest-singlenode.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index dae3dda476b..7b5f7bb2a9c 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -260,7 +260,7 @@ DEFAULT_IMAGE_NAME: cirros-0.5.1-x86_64-uec DEFAULT_IMAGE_FILE_NAME: cirros-0.5.1-x86_64-uec.tar.gz Q_ML2_TENANT_NETWORK_TYPE: vxlan - Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch Q_AGENT: openvswitch devstack_services: br-ex-tcpdump: true diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index c16f9eefa0b..1ae10df815e 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -12,7 +12,6 @@ tempest_concurrency: 4 devstack_localrc: Q_ML2_TENANT_NETWORK_TYPE: vxlan - Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge devstack_plugins: neutron: https://opendev.org/openstack/neutron.git devstack_services: @@ -53,6 +52,7 @@ vars: devstack_localrc: Q_AGENT: openvswitch + Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch irrelevant-files: &openvswitch-irrelevant-files - ^test-requirements.txt$ - ^.*\.conf\.sample$ @@ -106,6 +106,7 @@ vars: devstack_localrc: Q_AGENT: linuxbridge + Q_ML2_PLUGIN_MECHANISM_DRIVERS: linuxbridge devstack_local_conf: post-config: "/$NEUTRON_CORE_PLUGIN_CONF":