From 72e7874f32194c58a53470781427540a06f084d1 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 2 Apr 2014 18:19:37 +0800 Subject: [PATCH] Using ml2 as default plugin Change-Id: Ifb1cb9415522d97f357779306a561b543a17930f --- debian/neutron-common.templates | 2 +- debian/patches/better-config-default.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/neutron-common.templates b/debian/neutron-common.templates index e32ff245c..6ac68477e 100644 --- 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 4e21d3d6c..a1e8da514 100644 --- 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 -- 2.45.2