summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-05-18 15:31:41 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-05-18 15:31:41 +0000
commitbd0125647a04ab8da7eef934e4a97560c1553551 (patch)
tree9b99fc4de8cfc4c19ac608b59f77beb2fb945813 /nova/api
parent5c8e843f5ca4c2671b7d71d0fb05888301be2091 (diff)
Fix call to spawn_n() instead. It expects a callable
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index bd9711555..fcb630fae 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -609,9 +609,7 @@ class ControllerV10(Controller):
def _parse_update(self, context, server_id, inst_dict, update_dict):
if 'adminPass' in inst_dict['server']:
update_dict['admin_pass'] = inst_dict['server']['adminPass']
- # We call _set_admin_password() here to avoid the spawn_n in
- # set_admin_password()
- self.compute_api._set_admin_password(context, server_id,
+ self.compute_api.set_admin_password(context, server_id,
inst_dict['server']['adminPass'])
def _action_rebuild(self, info, request, instance_id):