From 60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Fri, 13 May 2011 10:26:50 -0500
Subject: Review feedback.

---
 nova/api/openstack/servers.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index aaff57b4a..547310613 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import base64
-import eventlet
 import traceback
 
 from webob import exc
@@ -176,9 +175,8 @@ class Controller(common.OpenstackController):
         builder = self._get_view_builder(req)
         server = builder.build(inst, is_detail=True)
         server['server']['adminPass'] = password
-        # We don't want this to block
-        eventlet.spawn(self.compute_api.set_admin_password(
-            context, server['server']['id'], password))
+        self.compute_api.set_admin_password(context, server['server']['id'],
+                                            password)
         return server
 
     def _deserialize_create(self, request):
-- 
cgit