From: armando-migliaccio <armamig@gmail.com>
Date: Sat, 17 Jan 2015 08:14:28 +0000 (-0800)
Subject: Move Monkey patch back to being as early as possible
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2025eb0c15581c57ec803b57ae561ec0ffdb75dc;p=openstack-build%2Fneutron-build.git

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 f973bc9f6..80fb566c9 100644
--- 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 836a3026f..acd273367 100644
--- 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 f07dad030..40a97b4be 100644
--- 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 2d4ae636d..7afeb78f6 100644
--- 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