[grenade] Explicitly enable Neutron ML2/OVS services in the CI job

As with [1] basic grenade job will be switched to run with OVN as
Neutron backend, which is default in Devstack, we need to explicitly
disable ML2/OVN neutron services in the grenade job and use
ML2/OVS related services in that job.

Related: https://review.opendev.org/c/openstack/ironic/+/866993

[1] https://review.opendev.org/c/openstack/grenade/+/862475

Change-Id: Ifc9923236c5971e1b63b15fb62506821c178926c
This commit is contained in:
Julia Kreger 2022-12-13 13:38:48 -08:00
parent d83454c3d0
commit 75e8c2ac50

View File

@ -144,6 +144,7 @@
IRONIC_AUTOMATED_CLEAN_ENABLED: False
IRONIC_INSPECTOR_DHCP_FILTER: iptables
Q_AGENT: openvswitch
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
SWIFT_ENABLE_TEMPURLS: True
SWIFT_TEMPURL_KEY: secretkey
@ -168,6 +169,18 @@
ir-cond: True
ironic-inspector-dhcp: True
ironic-inspector: True
# Neutron services
# In the Ironic grenade job we want to explicitly enable ML2/OVS agents
# and disable OVN
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-svc: true
q-metering: false
ovn-controller: false
ovn-northd: false
q-ovn-metadata-agent: false
tempest_plugins:
- ironic-tempest-plugin
tempest_test_regex: test_baremetal_introspection