[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 ironic-grenade job and use
ML2/OVS related services in that job.

Depends-On: https://review.opendev.org/c/openstack/devstack/+/867065

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

Change-Id: I2ef96d1b3e19004f05253dfae508e9f07ae58f63
This commit is contained in:
Sławek Kapłoński 2022-12-08 14:52:03 +01:00 committed by Slawek Kaplonski
parent 4d66609e95
commit 7c47ad04fc

View File

@ -890,6 +890,7 @@
IRONIC_AUTOMATED_CLEAN_ENABLED: False
Q_AGENT: openvswitch
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
SWIFT_ENABLE_TEMPURLS: True
SWIFT_TEMPURL_KEY: secretkey
EBTABLES_RACE_FIX: True
@ -910,6 +911,18 @@
cinder: False
ir-api: True
ir-cond: 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: true
ovn-controller: false
ovn-northd: false
q-ovn-metadata-agent: false
tempest_plugins:
- ironic-tempest-plugin
tempest_test_regex: ironic_tempest_plugin.tests.scenario