summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2019-01-04 16:44:13 -0800
committerJulia Kreger <juliaashleykreger@gmail.com>2019-01-08 14:02:09 -0800
commit82d4cf6f88a6b3bf45ca8909a7713af9f548fd7a (patch)
tree5756979db80cc99b41f33f3aac88cd591ca54134
parent43b5e8bba7f7f415a3dafe7ee4dbe5a0dead5337 (diff)
Directly source ML2 plugin for devstack
Source the plugin so we can directly invoke the ml2 helper methods without loading neutron-legacy devstack code which we do by using the q-* service names. This enables migration to the neutron-* service names to occur. Change-Id: Ia10839f36a240a503eb4b673a4e39105f1c6abb5
Notes
Notes (review): Code-Review+2: Mark Goddard <mark@stackhpc.com> Code-Review+2: Dmitry Tantsur <divius.inside@gmail.com> Workflow+1: Dmitry Tantsur <divius.inside@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 09 Jan 2019 17:28:34 +0000 Reviewed-on: https://review.openstack.org/628708 Project: openstack/networking-generic-switch Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 56998c5..3171ba7 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -217,6 +217,16 @@ if is_service_enabled generic_switch; then
217 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then 217 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
218 # Configure after the other layer 1 and 2 services have been configured 218 # Configure after the other layer 1 and 2 services have been configured
219 echo_summary "Configuring Generic_switch ML2" 219 echo_summary "Configuring Generic_switch ML2"
220
221 # Source ml2 plugin, set default config
222 if is_service_enabled neutron; then
223 source $RC_DIR/lib/neutron_plugins/ml2
224 Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ml2
225 Q_PLUGIN_CONF_FILENAME=ml2_conf.ini
226 Q_PLUGIN_CONF_FILE="/${Q_PLUGIN_CONF_PATH}/${Q_PLUGIN_CONF_FILENAME}"
227 Q_PLUGIN_CLASS="ml2"
228 fi
229
220 configure_generic_switch 230 configure_generic_switch
221 elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then 231 elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
222 if is_service_enabled tempest; then 232 if is_service_enabled tempest; then