summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-03-09 14:53:44 -0500
committerDan Prince <dan.prince@rackspace.com>2011-03-09 14:53:44 -0500
commita9bd1b456332aaf5f6ab9942979485f2192b6f3e (patch)
tree894d3f413f97e20a26cfc9f5a31ffc95ca0f77ea /nova/api
parenteadce208c55513ddbab550898e641b8ee55a67ec (diff)
Add password parameter to the set_admin_password call in the compute api.
Updated servers password to use this parameter.
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 7222285e0..41166f810 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -183,7 +183,8 @@ class Controller(wsgi.Controller):
password = "%s%s" % (server['server']['name'][:4],
utils.generate_password(12))
server['server']['adminPass'] = password
- self.compute_api.set_admin_password(context, server['server']['id'])
+ self.compute_api.set_admin_password(context, server['server']['id'],
+ password)
return server
def update(self, req, id):