Browse code
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
Kyle Mestery authored on 2013/08/05 21:24:32Showing 1 changed files
| ... | ... |
@@ -20,7 +20,7 @@ Q_AGENT=${Q_AGENT:-openvswitch}
|
| 20 | 20 |
source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
|
| 21 | 21 |
|
| 22 | 22 |
# List of MechanismDrivers to load |
| 23 |
-Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_PLUGIN_MECHANISM_DRIVERS:-}
|
|
| 23 |
+Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-}
|
|
| 24 | 24 |
# List of Type Drivers to load |
| 25 | 25 |
Q_ML2_PLUGIN_TYPE_DRIVERS=${Q_ML2_PLUGIN_TYPE_DRIVERS:-local,flat,vlan,gre,vxlan}
|
| 26 | 26 |
# Default GRE TypeDriver options |
| ... | ... |
@@ -92,6 +92,8 @@ function neutron_plugin_configure_service() {
|
| 92 | 92 |
# Since we enable the tunnel TypeDrivers, also enable a local_ip |
| 93 | 93 |
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP |
| 94 | 94 |
|
| 95 |
+ populate_ml2_config mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS /$Q_PLUGIN_CONF_FILE ml2 |
|
| 96 |
+ |
|
| 95 | 97 |
populate_ml2_config type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS /$Q_PLUGIN_CONF_FILE ml2 |
| 96 | 98 |
|
| 97 | 99 |
populate_ml2_config $Q_SRV_EXTRA_OPTS /$Q_PLUGIN_CONF_FILE ml2 |