From 4393dd37e106ae18b4ff9dc48d0f2e73db351f3b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 17 Dec 2015 14:38:08 +0100 Subject: [PATCH] Enable Guru Meditation Reports for other refarch agents OVS agent already supports GMR, but LinuxBridge and SR-IOV agents don't. To enable them for those agents, we should move their main() entry points under neutron/cmd/, so that __init__.py code that initializes them is triggered on their invocation. Since we put their entrypoints under neutron/cmd/eventlet/, there is now also no need to explicitly monkey patch stdlib for eventlet in the agents code (neutron/cmd/eventlet/__init__.py already does it for us). With that, there is no more code in the tree that directly patches stdlib except neutron/cmd/eventlet/__init__.py. Also removed a way to execute agent modules as scripts since it's not a supported way to invoke them (instead, stevedore generated console scripts should always be used). Change-Id: I9b823d07a41b575334e52065eed7e6be2741e79d Implements: blueprint guru-meditation-report --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 66ad544c..9dc75d6d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,7 +48,7 @@ console_scripts = neutron-keepalived-state-change = neutron.cmd.keepalived_state_change:main neutron-ipset-cleanup = neutron.cmd.ipset_cleanup:main neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main - neutron-linuxbridge-agent = neutron.plugins.ml2.drivers.linuxbridge.agent.linuxbridge_neutron_agent:main + neutron-linuxbridge-agent = neutron.cmd.eventlet.plugins.linuxbridge_neutron_agent:main neutron-linuxbridge-cleanup = neutron.cmd.linuxbridge_cleanup:main neutron-metadata-agent = neutron.cmd.eventlet.agents.metadata:main neutron-netns-cleanup = neutron.cmd.netns_cleanup:main @@ -63,7 +63,7 @@ console_scripts = neutron-rootwrap-daemon = oslo_rootwrap.cmd:daemon neutron-usage-audit = neutron.cmd.eventlet.usage_audit:main neutron-metering-agent = neutron.cmd.eventlet.services.metering_agent:main - neutron-sriov-nic-agent = neutron.plugins.ml2.drivers.mech_sriov.agent.sriov_nic_agent:main + neutron-sriov-nic-agent = neutron.cmd.eventlet.plugins.sriov_nic_neutron_agent:main neutron-sanity-check = neutron.cmd.sanity_check:main neutron.core_plugins = ml2 = neutron.plugins.ml2.plugin:Ml2Plugin