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 3ca24d89809a7a321bd3a5f33d6e7c025b053826..5b467a86e73622c156bf084f712268a1ae9dab37 100755 (executable)
--- 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 301b1861836534587e994e42d0ac8df7fb29e8a5..cde15a80b7c2aab078768a886ef1b4e1c72468a7 100755 (executable)
--- 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()