summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-03-31 15:32:31 -0500
committerJosh Kearney <josh@jk0.org>2011-03-31 15:32:31 -0500
commit032acaab1fd9a3823e203ddaf9c50857acd25ac7 (patch)
treeb40a97b95963047d11112268af016ff0e412ca29 /nova/api
parentde1b0dcf585bdfe2cefa1a7ec561a53ac8c515b8 (diff)
Don't include first 4 chars of instance name in adminPass
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 f7696d918..d47ea5788 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)