summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-09 17:28:34 +0000
committerGerrit Code Review <review@openstack.org>2019-01-09 17:28:34 +0000
commit28e6c91dca2441fe97c13853ba74a9cdea8cc57b (patch)
treecd005ddaa952473b6d290267ba1403d543614f23
parentb3fba36b82e88616c1b5259513556b1107c1bc7a (diff)
parent82d4cf6f88a6b3bf45ca8909a7713af9f548fd7a (diff)
Merge "Directly source ML2 plugin for devstack"
-rw-r--r--devstack/plugin.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cb5e716..9c17765 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -219,6 +219,16 @@ if is_service_enabled generic_switch; then
219 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then 219 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
220 # Configure after the other layer 1 and 2 services have been configured 220 # Configure after the other layer 1 and 2 services have been configured
221 echo_summary "Configuring Generic_switch ML2" 221 echo_summary "Configuring Generic_switch ML2"
222
223 # Source ml2 plugin, set default config
224 if is_service_enabled neutron; then
225 source $RC_DIR/lib/neutron_plugins/ml2
226 Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ml2
227 Q_PLUGIN_CONF_FILENAME=ml2_conf.ini
228 Q_PLUGIN_CONF_FILE="/${Q_PLUGIN_CONF_PATH}/${Q_PLUGIN_CONF_FILENAME}"
229 Q_PLUGIN_CLASS="ml2"
230 fi
231
222 configure_generic_switch 232 configure_generic_switch
223 elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then 233 elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
224 if is_service_enabled tempest; then 234 if is_service_enabled tempest; then