Merge "Default to the ML2 plugin in Neutron instead of OVS"

2013-10-01 02:22:08 +00:00
parent b48e008169 6d23500aa6
commit 3c5247fac9
1 changed files with 1 additions and 1 deletions
--- a/lib/neutron
+++ b/lib/neutron
@@ -88,7 +88,7 @@ NEUTRON_CONF=$NEUTRON_CONF_DIR/neutron.conf
 export NEUTRON_TEST_CONFIG_FILE=${NEUTRON_TEST_CONFIG_FILE:-"$NEUTRON_CONF_DIR/debug.ini"}

 # Default Neutron Plugin
-Q_PLUGIN=${Q_PLUGIN:-openvswitch}
+Q_PLUGIN=${Q_PLUGIN:-ml2}
 # Default Neutron Port
 Q_PORT=${Q_PORT:-9696}
 # Default Neutron Host