Browse code
Merge "Don't configure router in flat network"
Jenkins authored on 2016/06/28 06:39:16Showing 1 changed files
| ... | ... |
@@ -38,7 +38,9 @@ Q_ML2_PLUGIN_GENEVE_TYPE_OPTIONS=${Q_ML2_PLUGIN_GENEVE_TYPE_OPTIONS:-vni_ranges=
|
| 38 | 38 |
Q_ML2_PLUGIN_EXT_DRIVERS=${Q_ML2_PLUGIN_EXT_DRIVERS-port_security}
|
| 39 | 39 |
|
| 40 | 40 |
# L3 Plugin to load for ML2 |
| 41 |
-ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
|
|
| 41 |
+# For some flat network environment, they not want to extend L3 plugin. |
|
| 42 |
+# Make sure it is able to set empty to ML2_L3_PLUGIN. |
|
| 43 |
+ML2_L3_PLUGIN=${ML2_L3_PLUGIN-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
|
|
| 42 | 44 |
|
| 43 | 45 |
function populate_ml2_config {
|
| 44 | 46 |
CONF=$1 |