Explicitly set jobs sfc and bgpvpn to ML2/OVS

Devstack is changing the Neutron default to OVN backend.
This patch makes sure that neutron-tempest-plugin-sfc and
neutron-tempest-plugin-bgpvpn-bagpipe jobs use OVS backend and starts
all neutron services like DHCP-agent and metadata-agent.

Change-Id: I1f0c718b19781fa491c1e75a08282b30cf77ba1e
This commit is contained in:
elajkat 2021-05-12 11:28:40 +02:00 committed by Lajos Katona
parent 887f5ac730
commit 3d7420a2fd
1 changed files with 36 additions and 0 deletions

View File

@ -685,6 +685,21 @@
- openstack/neutron-tempest-plugin
- openstack/tempest
vars:
devstack_services:
# 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
# Enable Neutron services that are not used by OVN
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
network_api_extensions_common: *api_extensions
tempest_test_regex: ^neutron_tempest_plugin\.sfc
devstack_plugins:
@ -694,6 +709,9 @@
- flow_classifier
- sfc
devstack_localrc:
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_sfc) | join(',') }}"
# TODO(bcafarel): tests still fail from time to time in parallel
# https://bugs.launchpad.net/neutron/+bug/1851500
@ -707,12 +725,30 @@
- openstack/networking-bagpipe
- openstack/networking-bgpvpn
vars:
devstack_services:
# 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
# Enable Neutron services that are not used by OVN
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
tempest_test_regex: ^neutron_tempest_plugin\.bgpvpn
network_api_extensions: *api_extensions
network_api_extensions_bgpvpn:
- bgpvpn
- bgpvpn-routes-control
devstack_localrc:
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
NETWORKING_BGPVPN_DRIVER: "BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe_v2.BaGPipeBGPVPNDriver:default"
BAGPIPE_DATAPLANE_DRIVER_IPVPN: "ovs"
BAGPIPE_BGP_PEERS: "-"