Switch neutron multinode jobs to ML2/OVS

After switch of the default Neutron backend to ML2/OVN
in devstack we need to set ML2/OVS for proper multinode
jobs explicitly.

This patch configures ML2/OVS as a backend in the
'neutron-tempest-slow-py3', 'neutron-tempest-multinode-full-py3',
'neutron-tempest-dvr-ha-multinode-full' jobs.

Change-Id: I4d59a42db3e50cb1cb156a46cac708425f641b25
This commit is contained in:
Oleg Bondarev 2021-05-26 09:29:33 +03:00
parent e8e12b1413
commit 730117ddb0
2 changed files with 81 additions and 2 deletions

View File

@ -65,8 +65,7 @@
# https://bugs.launchpad.net/neutron/+bug/1920778 # https://bugs.launchpad.net/neutron/+bug/1920778
# will be fixed # will be fixed
# - neutron-grenade-dvr-multinode # - neutron-grenade-dvr-multinode
# TODO(obondarev): this job is disabled untill switched back to OVS - neutron-tempest-slow-py3
#- neutron-tempest-slow-py3
- neutron-tempest-ipv6-only - neutron-tempest-ipv6-only
- neutron-ovn-tempest-ovs-release - neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ovs-release-ipv6-only - neutron-ovn-tempest-ovs-release-ipv6-only

View File

@ -27,9 +27,26 @@
voting: false voting: false
vars: vars:
tox_envlist: integrated-network tox_envlist: integrated-network
devstack_localrc:
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
devstack_services: devstack_services:
br-ex-tcpdump: true br-ex-tcpdump: true
br-int-flows: true br-int-flows: true
# Neutron services
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
q-svc: true
# OVN services
ovn-controller: false
ovn-northd: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Cinder services # Cinder services
c-api: false c-api: false
c-bak: false c-bak: false
@ -76,12 +93,21 @@
subnode: subnode:
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git neutron: https://opendev.org/openstack/neutron.git
devstack_localrc:
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
devstack_services: devstack_services:
q-agt: true q-agt: true
q-l3: true q-l3: true
q-meta: true q-meta: true
br-ex-tcpdump: true br-ex-tcpdump: true
br-int-flows: true br-int-flows: true
# OVN services
ovn-controller: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Cinder services # Cinder services
c-api: false c-api: false
c-bak: false c-bak: false
@ -125,11 +151,28 @@
irrelevant-files: *openvswitch-irrelevant-files irrelevant-files: *openvswitch-irrelevant-files
vars: vars:
tox_envlist: integrated-network tox_envlist: integrated-network
devstack_localrc:
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git neutron: https://opendev.org/openstack/neutron.git
devstack_services: devstack_services:
br-ex-tcpdump: true br-ex-tcpdump: true
br-int-flows: true br-int-flows: true
# Neutron services
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
q-svc: true
# OVN services
ovn-controller: false
ovn-northd: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Cinder services # Cinder services
c-api: false c-api: false
c-bak: false c-bak: false
@ -151,7 +194,17 @@
debug_iptables_rules: True debug_iptables_rules: True
group-vars: group-vars:
subnode: subnode:
devstack_localrc:
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
devstack_services: devstack_services:
q-agt: true
# OVN services
ovn-controller: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Cinder services # Cinder services
c-bak: false c-bak: false
c-vol: false c-vol: false
@ -169,9 +222,26 @@
vars: vars:
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git neutron: https://opendev.org/openstack/neutron.git
devstack_localrc:
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
devstack_services: devstack_services:
br-ex-tcpdump: true br-ex-tcpdump: true
br-int-flows: true br-int-flows: true
# Neutron services
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
q-svc: true
# OVN services
ovn-controller: false
ovn-northd: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Cinder services # Cinder services
c-api: false c-api: false
c-bak: false c-bak: false
@ -190,7 +260,17 @@
debug_iptables_rules: True debug_iptables_rules: True
group-vars: group-vars:
subnode: subnode:
devstack_localrc:
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
devstack_services: devstack_services:
q-agt: true
# OVN services
ovn-controller: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Cinder services # Cinder services
c-bak: false c-bak: false
c-vol: false c-vol: false