diff options
| author | Josh Kearney <josh@jk0.org> | 2011-05-13 10:26:50 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-05-13 10:26:50 -0500 |
| commit | 60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008 (patch) | |
| tree | 4e6777ccf29d27a99e9148c847e82a07fe70643f /nova/api | |
| parent | b4357fef25a0f6a402979d15c1ecbf4abb8643a8 (diff) | |
| download | nova-60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008.tar.gz nova-60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008.tar.xz nova-60dcc66db2a08bd4acfe2f3fc3e66cc382e7d008.zip | |
Review feedback.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 6 |
1 files changed, 2 insertions, 4 deletions
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): |