diff options
| author | Dan Prince <dprince@redhat.com> | 2012-07-03 23:15:06 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2012-07-04 06:24:54 -0400 |
| commit | dab6261216dab3879c45c4e89f29627a16d8db1a (patch) | |
| tree | acd2de6aa373276175126c5659747888b3eaae52 | |
| parent | 63ce7031d1b0fd0c251fffea55bc7120e3d1f6b0 (diff) | |
| download | nova-dab6261216dab3879c45c4e89f29627a16d8db1a.tar.gz nova-dab6261216dab3879c45c4e89f29627a16d8db1a.tar.xz nova-dab6261216dab3879c45c4e89f29627a16d8db1a.zip | |
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
| -rw-r--r-- | nova/api/auth.py | 1 |
1 files changed, 1 insertions, 0 deletions
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')) |