From e64bf6be1b03d0f34581d9aa72921b7deb9bfbff Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Mon, 10 Feb 2020 13:21:36 +0000 Subject: [PATCH] [OVN] Devstack: Fix adding another compute node In order to add another compute node to an existing DevStack setup (multi-node) we need to set a few extra variables to the local.conf to enable the OVN driver in neutron. The patch is also adding a new neutron_plugin_create_nova_conf function to the ovn_agent module (no-op) otherwise the DevStack setup will fail. Change-Id: I4d53f7206f151dc7ffa51b4c8bd601279aa88a46 Signed-off-by: Lucas Alvares Gomes --- devstack/lib/ovn_agent | 4 ++++ devstack/ovn-compute-local.conf.sample | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent index b68fb521547..ee719c1a8f6 100644 --- a/devstack/lib/ovn_agent +++ b/devstack/lib/ovn_agent @@ -777,3 +777,7 @@ function cleanup_ovn { sudo rm -f $OVN_RUNDIR } + +function neutron_plugin_create_nova_conf { + : +} diff --git a/devstack/ovn-compute-local.conf.sample b/devstack/ovn-compute-local.conf.sample index e934a13ec45..6657f7ab380 100644 --- a/devstack/ovn-compute-local.conf.sample +++ b/devstack/ovn-compute-local.conf.sample @@ -17,6 +17,12 @@ SERVICE_PASSWORD=password SERVICE_TOKEN=password ADMIN_PASSWORD=password +Q_AGENT=ovn +NEUTRON_AGENT=$Q_AGENT +Q_ML2_PLUGIN_MECHANISM_DRIVERS=ovn,logger +Q_ML2_PLUGIN_TYPE_DRIVERS=local,flat,vlan,geneve +Q_ML2_TENANT_NETWORK_TYPE="geneve" + # Enable devstack spawn logging LOGFILE=$DEST/logs/stack.sh.log