summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-05-24 22:31:11 +0000
committerTarmac <>2011-05-24 22:31:11 +0000
commit4108c32a5e30d9ee4367e433471fbf2a5bf15ed2 (patch)
treeab7d669db827596d29d3cf718a983d84ab4e48ac /nova/api
parent3f84a2dfb500a19f44db4c06f22c42e54ce7da2a (diff)
parentbd0125647a04ab8da7eef934e4a97560c1553551 (diff)
downloadnova-4108c32a5e30d9ee4367e433471fbf2a5bf15ed2.tar.gz
nova-4108c32a5e30d9ee4367e433471fbf2a5bf15ed2.tar.xz
nova-4108c32a5e30d9ee4367e433471fbf2a5bf15ed2.zip
Using the root-password subcommand of the nova client results in the password being changed for the instance specified, but to a different unknown password. The patch changes nova to use the password specified in the 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']