From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 26 Mar 2015 19:37:52 +0000 (+0000)
Subject: Merge "Missing entry points for cisco apic topology agents"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5972cc4ed5e16cd2f55e098913e4a862aa354e97;p=openstack-build%2Fneutron-build.git

Merge "Missing entry points for cisco apic topology agents"
---

5972cc4ed5e16cd2f55e098913e4a862aa354e97
diff --cc setup.cfg
index c5af580b5,360e489cc..da27876d4
--- a/setup.cfg
+++ b/setup.cfg
@@@ -111,11 -111,13 +111,13 @@@ console_scripts 
      neutron-restproxy-agent = neutron.plugins.bigswitch.agent.restproxy_agent:main
      neutron-server = neutron.cmd.eventlet.server:main
      neutron-rootwrap = oslo_rootwrap.cmd:main
 +    neutron-rootwrap-daemon = oslo_rootwrap.cmd:daemon
      neutron-usage-audit = neutron.cmd.usage_audit:main
      neutron-metering-agent = neutron.cmd.eventlet.services.metering_agent:main
 -    neutron-ofagent-agent = neutron.plugins.ofagent.agent.main:main
      neutron-sriov-nic-agent = neutron.plugins.sriovnicagent.sriov_nic_agent:main
      neutron-sanity-check = neutron.cmd.sanity_check:main
+     neutron-cisco-apic-service-agent = neutron.plugins.ml2.drivers.cisco.apic.apic_topology:service_main
+     neutron-cisco-apic-host-agent = neutron.plugins.ml2.drivers.cisco.apic.apic_topology:agent_main
  neutron.core_plugins =
      bigswitch = neutron.plugins.bigswitch.plugin:NeutronRestProxyV2
      brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2