From 6b01ecf9ea393f89d5ee9b41f534fb785aa22450 Mon Sep 17 00:00:00 2001 From: Bence Romsics Date: Tue, 18 Feb 2020 15:27:58 +0100 Subject: [PATCH] Limit ovn sanity checks to q-svc The sanity checks related to neutron-server config only make sense when q-svc service is enabled. When building a devstack without q-svc (for example a compute-only devstack) do not force this configuration to be present where it's meaningless. Change-Id: I5b9176d4a55a826f498e367f1f02569429dbe546 --- devstack/lib/ovn_agent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack/lib/ovn_agent b/devstack/lib/ovn_agent index d0c51beda65..9cf063c4eaf 100644 --- a/devstack/lib/ovn_agent +++ b/devstack/lib/ovn_agent @@ -416,9 +416,9 @@ function ovn_sanity_check { die $LINENO "The q-agt/neutron-agt service must be disabled with OVN." elif is_service_enabled q-l3 neutron-l3; then die $LINENO "The q-l3/neutron-l3 service must be disabled with OVN." - elif [[ ! $Q_ML2_PLUGIN_MECHANISM_DRIVERS =~ "ovn" ]]; then + elif is_service_enabled q-svc neutron-api && [[ ! $Q_ML2_PLUGIN_MECHANISM_DRIVERS =~ "ovn" ]]; then die $LINENO "OVN needs to be enabled in \$Q_ML2_PLUGIN_MECHANISM_DRIVERS" - elif [[ ! $Q_ML2_PLUGIN_TYPE_DRIVERS =~ "geneve" ]]; then + elif is_service_enabled q-svc neutron-api && [[ ! $Q_ML2_PLUGIN_TYPE_DRIVERS =~ "geneve" ]]; then die $LINENO "Geneve needs to be enabled in \$Q_ML2_PLUGIN_TYPE_DRIVERS to be used with OVN" fi }