| commit | 3c5247fac956294c9209d69145e4ff6ee2e52baf | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Oct 01 02:22:08 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Oct 01 02:22:08 2013 +0000 |
| tree | cf4adc9e8e580a08c5516e860851f4360b161ab8 | |
| parent | b48e00816984cee78b3e9be5cce000eba5b42ab0 [diff] | |
| parent | 6d23500aa66e3d399cd263c2fb1d07dba0e0170c [diff] |
Merge "Default to the ML2 plugin in Neutron instead of OVS"
diff --git a/lib/neutron b/lib/neutron index 4a3d1b0..b1f96fc 100644 --- a/lib/neutron +++ b/lib/neutron
@@ -88,7 +88,7 @@ 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