From 6d23500aa66e3d399cd263c2fb1d07dba0e0170c Mon Sep 17 00:00:00 2001
From: Kyle Mestery <kmestery@cisco.com>
Date: Wed, 18 Sep 2013 20:27:08 +0000
Subject: [PATCH] Default to the ML2 plugin in Neutron instead of OVS

In Icehouse, the OVS and LinuxBridge plugins are being deprecated in
favor of the Modular Layer 2 (ML2) plugin. This change modifies
devstack to default to ML2 when Neutron is used for networking.

Fixes bug 1220745

Change-Id: I9a4c84b04727a710219fc11f862a655309ffb99b
---
 lib/neutron | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/neutron b/lib/neutron
index 4a3d1b06a6..b1f96fce79 100644
--- 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