Update definition of the neutron-tempest-plugin-dvr-multinode-scenario
This job needs to be run using ML2/OVS backend so this patch sets
that backend there explicitly.
Change-Id: I477b309142dff9c50217142a60e54b7064f8c120
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index a775711..40e9b6a 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -497,6 +497,9 @@
ADVANCED_INSTANCE_TYPE: ds512M
ADVANCED_INSTANCE_USER: ubuntu
BUILD_TIMEOUT: 784
+ Q_AGENT: openvswitch
+ Q_ML2_TENANT_NETWORK_TYPE: vxlan
+ Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git
neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git
@@ -504,6 +507,20 @@
- neutron-tempest-plugin
devstack_services:
tempest: true
+ # Disable OVN services
+ br-ex-tcpdump: false
+ br-int-flows: false
+ ovn-controller: false
+ ovn-northd: false
+ ovs-vswitchd: false
+ ovsdb-server: false
+ q-ovn-metadata-agent: false
+ # Neutron services
+ q-agt: true
+ q-dhcp: true
+ q-l3: true
+ q-meta: true
+ q-metering: true
neutron-dns: true
neutron-qos: true
neutron-segments: true
@@ -578,6 +595,15 @@
group-vars:
subnode:
devstack_services:
+ br-ex-tcpdump: false
+ br-int-flows: false
+ # Disable OVN services
+ ovn-controller: false
+ ovn-northd: false
+ ovs-vswitchd: false
+ ovsdb-server: false
+ q-ovn-metadata-agent: false
+ # Neutron services
q-agt: true
q-l3: true
q-meta: true
@@ -595,6 +621,9 @@
s-proxy: false
devstack_localrc:
USE_PYTHON3: true
+ Q_AGENT: openvswitch
+ Q_ML2_TENANT_NETWORK_TYPE: vxlan
+ Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
devstack_local_conf:
post-config:
$NEUTRON_CONF: