diff options
| author | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 16:51:05 -0500 |
|---|---|---|
| committer | Mark Washenberger <mark.washenberger@rackspace.com> | 2011-03-09 16:51:05 -0500 |
| commit | 355870e732f11ee21642a9ce0568fa30ef7b16bb (patch) | |
| tree | 29b283bd6bcb33ab960afcf85f817b70e8112ab8 /nova/api | |
| parent | 95d25ba3f4cd3345355922018295f3789d5ddb7c (diff) | |
| parent | f93e424c0c722f5607086349787a95517f31d79b (diff) | |
| download | nova-355870e732f11ee21642a9ce0568fa30ef7b16bb.tar.gz nova-355870e732f11ee21642a9ce0568fa30ef7b16bb.tar.xz nova-355870e732f11ee21642a9ce0568fa30ef7b16bb.zip | |
merge lp:nova, fix conflicts, fix tests
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 419a001fb..248d764ce 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -100,7 +100,7 @@ class Controller(wsgi.Controller): 'application/xml': { "attributes": { "server": ["id", "imageId", "name", "flavorId", "hostId", - "status", "progress"]}}} + "status", "progress", "adminPass"]}}} def __init__(self): self.compute_api = compute.API() @@ -183,7 +183,14 @@ class Controller(wsgi.Controller): key_data=key_pair['public_key'], metadata=metadata, personality_files=personality_files) - return _translate_keys(instances[0]) + + server = _translate_keys(instances[0]) + 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'], + password) + return server def _deserialize_create(self, request): """ |