From aa4ffe5f2c5b0b8722e5e6ddf737995b9c333aa2 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Tue, 13 Oct 2020 13:46:20 -0400
Subject: [PATCH] Change devstack script to correctly configure driver

With the OVN devstack code now in-tree, either Q_AGENT
or NEUTRON_AGENT can be set to "ovn", but the provider
driver plugin was only checking for the latter. This led
to things not being installed or configured depending on
how local.conf was written. Let's support either.

Change-Id: I230cc82559b4cc86d6443bff89881dba55b52503
---
 devstack/plugin.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 11f06fec..8b33b864 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -25,7 +25,9 @@ function _configure_provider_driver {
 }
 
 function is_ovn_enabled {
-    [[ $NEUTRON_AGENT == "ovn" ]] && return 0
+    if [[ $NEUTRON_AGENT == "ovn" || $Q_AGENT == "ovn" ]]; then
+        return 0
+    fi
     return 1
 }