From: Jenkins Date: Sun, 30 Aug 2015 05:07:49 +0000 (+0000) Subject: Merge "PLUMgrid plugin decomposition part II" X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a574640ab74a4ed2f8ddf4392244f8d10110c666;p=openstack-build%2Fneutron-build.git Merge "PLUMgrid plugin decomposition part II" --- a574640ab74a4ed2f8ddf4392244f8d10110c666 diff --cc setup.cfg index a64907303,de3d295e7..5f3de4db1 --- a/setup.cfg +++ b/setup.cfg @@@ -68,9 -70,9 +68,8 @@@ data_files etc/neutron/plugins/ml2/ml2_conf_sriov.ini etc/neutron/plugins/ml2/openvswitch_agent.ini etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini - etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini etc/neutron/plugins/oneconvergence = etc/neutron/plugins/oneconvergence/nvsdplugin.ini - etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini etc/neutron/plugins/opencontrail = etc/neutron/plugins/opencontrail/contrailplugin.ini etc/neutron/plugins/ovsvapp = etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini scripts = @@@ -108,11 -111,12 +107,10 @@@ neutron.core_plugins brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2 cisco = neutron.plugins.cisco.network_plugin:PluginV2 embrane = neutron.plugins.embrane.plugins.embrane_ml2_plugin:EmbraneMl2Plugin - ibm = neutron.plugins.ibm.sdnve_neutron_plugin:SdnvePluginV2 midonet = neutron.plugins.midonet.plugin:MidonetPluginV2 ml2 = neutron.plugins.ml2.plugin:Ml2Plugin - nec = neutron.plugins.nec.nec_plugin:NECPluginV2 nuage = neutron.plugins.nuage.plugin:NuagePlugin oneconvergence = neutron.plugins.oneconvergence.plugin:OneConvergencePluginV2 - plumgrid = neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin:NeutronPluginPLUMgridV2 neutron.service_plugins = dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin