From 3ea28ece4a71b0137050314af0e4f3e55046db11 Mon Sep 17 00:00:00 2001 From: Kyle Mestery Date: Mon, 5 Aug 2013 12:24:32 +0000 Subject: [PATCH] Correctly setup ML2 mechanism_drivers The ML2 code in devstack was not correctly configuring the mechanism_drivers when asked to do so. This corrects the typo in the variable assignment, and also actually sets these in the plugin configuration file. Fixes bug 1208557 Change-Id: I3746ca099f45d44dcf1cc2ca1c3726745b8e8a1d --- lib/neutron_plugins/ml2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2 index ff49d8e6b8..00bd716309 100644 --- a/lib/neutron_plugins/ml2 +++ b/lib/neutron_plugins/ml2 @@ -20,7 +20,7 @@ Q_AGENT=${Q_AGENT:-openvswitch} source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent # List of MechanismDrivers to load -Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_PLUGIN_MECHANISM_DRIVERS:-} +Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-} # List of Type Drivers to load Q_ML2_PLUGIN_TYPE_DRIVERS=${Q_ML2_PLUGIN_TYPE_DRIVERS:-local,flat,vlan,gre,vxlan} # Default GRE TypeDriver options @@ -92,6 +92,8 @@ function neutron_plugin_configure_service() { # Since we enable the tunnel TypeDrivers, also enable a local_ip iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP + populate_ml2_config mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS /$Q_PLUGIN_CONF_FILE ml2 + populate_ml2_config type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS /$Q_PLUGIN_CONF_FILE ml2 populate_ml2_config $Q_SRV_EXTRA_OPTS /$Q_PLUGIN_CONF_FILE ml2