From: Gary Kotton <gkotton@redhat.com>
Date: Sun, 2 Sep 2012 15:15:32 +0000 (-0400)
Subject: Fixes agent problem with RPC
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=efa4316f648201c35c2175d6065b57abb8c8a7dc;p=openstack-build%2Fneutron-build.git

Fixes agent problem with RPC

Fixed bug 1044135

When quantum-openvswitch-agent or quantum-linuxbridge-agent were
called the eventlet monkey patch was not invoked.

Change-Id: Iafb7fd02d37415c3466213d28280bcb4573de4a8
---

diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
index 3ca24d898..5b467a86e 100755
--- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
@@ -761,6 +761,7 @@ class LinuxBridgeQuantumAgentRPC:
 
 
 def main():
+    eventlet.monkey_patch()
     cfg.CONF(args=sys.argv, project='quantum')
 
     # (TODO) gary - swap with common logging
@@ -798,5 +799,4 @@ def main():
     sys.exit(0)
 
 if __name__ == "__main__":
-    eventlet.monkey_patch()
     main()
diff --git a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
index 301b18618..cde15a80b 100755
--- a/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
+++ b/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
@@ -727,6 +727,7 @@ class OVSQuantumAgent(object):
 
 
 def main():
+    eventlet.monkey_patch()
     cfg.CONF(args=sys.argv, project='quantum')
 
     # (TODO) gary - swap with common logging
@@ -765,5 +766,4 @@ def main():
     sys.exit(0)
 
 if __name__ == "__main__":
-    eventlet.monkey_patch()
     main()