]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Fix the metadata server auth (KeystoneCreds only sent from heat)
authorAngus Salkeld <asalkeld@redhat.com>
Fri, 15 Jun 2012 00:55:51 +0000 (10:55 +1000)
committerAngus Salkeld <asalkeld@redhat.com>
Fri, 15 Jun 2012 00:55:51 +0000 (10:55 +1000)
Change-Id: I918ff76485649ec56312f7029895d61e0cbf7a4b
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
heat/common/context.py

index d452bb2b04ba0975ad3c40a7ba560b55e8c84350..93faac76f056925f9de1137a5fd07d4089494b7d 100644 (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')