summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-04-04 17:56:19 +0000
committerTarmac <>2011-04-04 17:56:19 +0000
commitc7dd09c56b746e0b293b1778b5287d245ada2389 (patch)
tree527e6ca61a872965283a3a49304bf80dfb28b531 /nova/api
parenta26be4c1197f9bc455163471884cac8ec28e82bc (diff)
parent4a0c0618f7e0554a474fb1462badadbe66ead4f8 (diff)
Don't prefix adminPass with the first 4 chars of the instance name.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 4e2ebb2bd..6704a68ae 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -180,8 +180,7 @@ class Controller(wsgi.Controller):
builder = self._get_view_builder(req)
server = builder.build(inst, is_detail=True)
- password = "%s%s" % (server['server']['name'][:4],
- utils.generate_password(12))
+ password = utils.generate_password(16)
server['server']['adminPass'] = password
self.compute_api.set_admin_password(context, server['server']['id'],
password)