Move Monkey patch back to being as early as possible

Commit 6ca8cb84fd8 moved the patching early in the loading process.
After some reshuffling in the agents, this might not be as early
as possible, so move them closer to their main()'s.

Change-Id: Ifddd3a3d87ef6cc06788e9b4c40d6a6d981ebe0c

diff --git a/neutron/agent/l3/agent.py b/neutron/agent/l3/agent.py
index f973bc9f69ee0f4c549cfd10aadb4ea7ccc04070..80fb566c9d091f304b521065258a324b11a4d8a7 100644 (file)
--- a/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@ -14,8 +14,6 @@
 #
 
 import eventlet
-eventlet.monkey_patch()
-
 import netaddr
 from oslo.config import cfg
 from oslo import messaging

diff --git a/neutron/agent/l3_agent.py b/neutron/agent/l3_agent.py
index 836a3026f42cb42297ee3d98aeeda99ed3cbf485..acd2733672b091411ba876db47c2f04af707b741 100644 (file)
--- a/neutron/agent/l3_agent.py
+++ b/neutron/agent/l3_agent.py
@@ -16,6 +16,9 @@
 
 import sys
 
+import eventlet
+eventlet.monkey_patch()
+
 from oslo.config import cfg
 
 from neutron.agent.common import config

diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py
index f07dad030cf764314d828e31dfde9a3e65a613eb..40a97b4be4d2ca09f53bb9966b4b80226bd6e383 100644 (file)
--- a/neutron/agent/metadata/agent.py
+++ b/neutron/agent/metadata/agent.py
@@ -18,8 +18,6 @@ import os
 import socket
 
 import eventlet
-eventlet.monkey_patch()
-
 import httplib2
 from neutronclient.v2_0 import client
 from oslo.config import cfg

diff --git a/neutron/agent/metadata_agent.py b/neutron/agent/metadata_agent.py
index 2d4ae636dfae088d971ffab30749f941b1afd4b7..7afeb78f619403e8a6ff32bdd82b52dee9b028a3 100644 (file)
--- a/neutron/agent/metadata_agent.py
+++ b/neutron/agent/metadata_agent.py
@@ -14,6 +14,9 @@
 
 import sys
 
+import eventlet
+eventlet.monkey_patch()
+
 from oslo.config import cfg
 
 from neutron.agent.common import config as agent_conf