Browse code
Merge "Default to the ML2 plugin in Neutron instead of OVS"
Jenkins authored on 2013/10/01 11:22:08Showing 1 changed files
| ... | ... |
@@ -88,7 +88,7 @@ NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf |
| 88 | 88 |
export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}
|
| 89 | 89 |
|
| 90 | 90 |
# Default Neutron Plugin |
| 91 |
-Q_PLUGIN=${Q_PLUGIN:-openvswitch}
|
|
| 91 |
+Q_PLUGIN=${Q_PLUGIN:-ml2}
|
|
| 92 | 92 |
# Default Neutron Port |
| 93 | 93 |
Q_PORT=${Q_PORT:-9696}
|
| 94 | 94 |
# Default Neutron Host |