Using ml2 as default plugin

Change-Id: Ifb1cb9415522d97f357779306a561b543a17930f

diff --git a/debian/neutron-common.templates b/debian/neutron-common.templates
index e32ff245c37b15dc427d7cc33bdafeefd135cbbb..6ac68477e4127662f93eaa371998e712e8cf5150 100644 (file)
--- a/debian/neutron-common.templates
+++ b/debian/neutron-common.templates
@@ -35,7 +35,7 @@ Template: neutron/plugin-select
 Type: select
 __Choices: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
 Choices-C: OpenVSwitch, LinuxBridge, ml2, Brocade, Nicira, Midonet, NEC, Mellanox, Hyper-V, RYU, ml2/ml2_conf.ini, MetaPlugin, BigSwitch, Cisco, PLUMgrid
-Default: OpenVSwitch
+Default: ml2
 _Description: Neutron plugin:
  Neutron uses a plugin architecture to manage networking. When starting the
  Neutron server daemon, the configuration file corresponding to the plugin you

diff --git a/debian/patches/better-config-default.patch b/debian/patches/better-config-default.patch
index 4e21d3d6c3067745586624eaf289a519a6feaf42..a1e8da514f83879c72cc61ef3d54f1191b9e4f56 100644 (file)
--- a/debian/patches/better-config-default.patch
+++ b/debian/patches/better-config-default.patch
@@ -28,7 +28,7 @@ Last-Update: 2014-04-02
  #
 -# core_plugin =
 -# Example: core_plugin = ml2
-+core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
++core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
  
  # (ListOpt) List of service plugin entrypoints to be loaded from the
  # neutron.service_plugins namespace. See setup.cfg for the entrypoint names of