From e097c5a7923954543c49c1a21a078937f0f0dc75 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Mon, 22 Feb 2021 13:36:03 +0000 Subject: [PATCH] [OVN] Explicitly set grenade job to ML2/OVS Devstack is changing the Neutron default to OVN backend. For the grenade job we need to wait until the stable branch is deployed with OVN so that we can upgrade it to master. Change-Id: I51f0273e90ee39d644cf85a0bdb9d4f95de6d3c7 Signed-off-by: Lucas Alvares Gomes --- playbooks/legacy/nova-grenade-multinode/run.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/playbooks/legacy/nova-grenade-multinode/run.yaml b/playbooks/legacy/nova-grenade-multinode/run.yaml index 18f7c753eb..98bcbe6239 100644 --- a/playbooks/legacy/nova-grenade-multinode/run.yaml +++ b/playbooks/legacy/nova-grenade-multinode/run.yaml @@ -49,6 +49,15 @@ # to the other, which is mostly only interesting for grenade since # we have mixed level computes. export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIVE_MIGRATE_BACK_AND_FORTH=True" + # TODO(lucasagomes): The block below is explicitly enabling + # ML2/OVS for the nova grenade jobs. Remove it after at least + # one release where ML2/OVN is the default backend. + export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_AGENT=openvswitch" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=vxlan" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_MECHANISM_DRIVERS=openvswitch,l2population" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ovn-controller" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ovn-northd" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service q-ovn-metadata-agent" export BRANCH_OVERRIDE=default export DEVSTACK_GATE_TOPOLOGY="multinode" if [ "$BRANCH_OVERRIDE" != "default" ] ; then