From 6f569afc021020c2aa9fa84738cef540f59daeaf Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Thu, 25 Mar 2021 07:45:30 +0100
Subject: [PATCH] Improve enabled_provider_drivers default in devstack

Define a default value for enabled_provider_drivers that is closer to
the value defined in octavia.
The octavia-tempest-plugin default provider is still 'octavia', so
enabling the ovn-provider plugin broke the tempest plugin default
settings.

Also fix some double-quote issues when using spaces in the
OCTAVIA_PROVIDER_DRIVERS string.

Change-Id: I21aa03f7cc661f4e5669805fc7f45a7a322e2597
---
 devstack/plugin.sh | 2 +-
 devstack/settings  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8b33b864..e8287881 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -12,7 +12,7 @@ fi
 OVN_NB_REMOTE=${OVN_NB_REMOTE:-$OVN_PROTO:$SERVICE_HOST:6641}
 
 function _configure_provider_driver {
-    iniset ${OCTAVIA_CONF} api_settings enabled_provider_drivers ${OCTAVIA_PROVIDER_DRIVERS}
+    iniset ${OCTAVIA_CONF} api_settings enabled_provider_drivers "${OCTAVIA_PROVIDER_DRIVERS}"
     iniset ${OCTAVIA_CONF} driver_agent enabled_provider_agents ${OCTAVIA_PROVIDER_AGENTS}
     iniset ${OCTAVIA_CONF} ovn ovn_nb_connection "$OVN_NB_REMOTE"
 
diff --git a/devstack/settings b/devstack/settings
index ee3a7f56..9ae40585 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,6 +1,6 @@
 OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
 OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/octavia"}
-OCTAVIA_PROVIDER_DRIVERS=${OCTAVIA_PROVIDER_DRIVERS:-"amphora:Amphora,ovn:OVN"}
+OCTAVIA_PROVIDER_DRIVERS=${OCTAVIA_PROVIDER_DRIVERS:-"amphora:The Octavia Amphora driver.,octavia:Deprecated alias of the Octavia Amphora driver.,ovn:Octavia OVN driver."}
 OCTAVIA_PROVIDER_AGENTS=${OCTAVIA_PROVIDER_AGENTS:-"ovn"}
 
 OVN_OCTAVIA_PROVIDER_DIR=$DEST/ovn-octavia-provider