summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-05-17 16:46:13 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-05-17 16:46:13 +0000
commitb312ac2634f530273e599ee48ff2e3a238bbbf4f (patch)
tree1d2c5f805b5971074ca23027b47e3c63f953ee65 /nova/api
parentd159c3d670beb5208542e73445b7c6a3f86d3b53 (diff)
downloadnova-b312ac2634f530273e599ee48ff2e3a238bbbf4f.tar.gz
nova-b312ac2634f530273e599ee48ff2e3a238bbbf4f.tar.xz
nova-b312ac2634f530273e599ee48ff2e3a238bbbf4f.zip
Set password to one requested in API call
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8f2de2afe..fcb630fae 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -609,7 +609,8 @@ 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']
- 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):
context = request.environ['nova.context']