openstack/ovn-octavia-provider
Code Issues Proposed changes

Improve enabled_provider_drivers default in devstack

Browse Source 
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
This commit is contained in:
Gregory Thiemonge 2021-03-25 07:45:30 +01:00
parent 915e561c9e
commit 6f569afc02
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -12,7 +12,7 @@ fi
OVN_NB_REMOTE=${OVN_NB_REMOTE:-$OVN_PROTO:$SERVICE_HOST:6641} OVN_NB_REMOTE=${OVN_NB_REMOTE:-$OVN_PROTO:$SERVICE_HOST:6641}
function _configure_provider_driver { 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} driver_agent enabled_provider_agents ${OCTAVIA_PROVIDER_AGENTS}
iniset ${OCTAVIA_CONF} ovn ovn_nb_connection "$OVN_NB_REMOTE" iniset ${OCTAVIA_CONF} ovn ovn_nb_connection "$OVN_NB_REMOTE"

2
devstack/settings
View File

@ -1,6 +1,6 @@
OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"} OCTAVIA_DIR=${OCTAVIA_DIR:-"${DEST}/octavia"}
OCTAVIA_CONF_DIR=${OCTAVIA_CONF_DIR:-"/etc/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"} OCTAVIA_PROVIDER_AGENTS=${OCTAVIA_PROVIDER_AGENTS:-"ovn"}
OVN_OCTAVIA_PROVIDER_DIR=$DEST/ovn-octavia-provider OVN_OCTAVIA_PROVIDER_DIR=$DEST/ovn-octavia-provider