Fix the metadata server auth (KeystoneCreds only sent from heat)

Change-Id: I918ff76485649ec56312f7029895d61e0cbf7a4b
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-06-15 10:55:51 +10:00
parent f45d436263
commit d36d8d38ba
1 changed files with 4 additions and 3 deletions

View File

@ -173,9 +173,10 @@ class ContextMiddleware(wsgi.Middleware):
# I Haven't tested to see if WSGI stuff would escape
# everything to make this safe. However, I haven't found
# a better way to do this either.
creds = eval(req.params['KeyStoneCreds'])
username = creds['username']
password = creds['password']
if 'KeyStoneCreds' in req.params:
creds = eval(req.params['KeyStoneCreds'])
username = creds['username']
password = creds['password']
token = headers.get('X-Auth-Token')
service_user = headers.get('X-Admin-User')