From dab6261216dab3879c45c4e89f29627a16d8db1a Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 3 Jul 2012 23:15:06 -0400 Subject: Assign service_catalog in NovaKeystoneContext. Updates NovaKeystoneContext so that the service_catalog variable is assigned regardless of whether X_SERVICE_CATALOG is set. Fixes LP Bug #1020779 Change-Id: I3ab15fa53488f2f352718fd230d8ec5e3a38cf56 --- nova/api/auth.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nova/api/auth.py b/nova/api/auth.py index 81e0a0377..5191189f2 100644 --- a/nova/api/auth.py +++ b/nova/api/auth.py @@ -97,6 +97,7 @@ class NovaKeystoneContext(wsgi.Middleware): if FLAGS.use_forwarded_for: remote_address = req.headers.get('X-Forwarded-For', remote_address) + service_catalog = None if req.headers.get('X_SERVICE_CATALOG') is not None: service_catalog = json.loads(req.headers.get('X_SERVICE_CATALOG')) -- cgit