diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-05 15:46:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-05 15:46:47 +0000 |
| commit | 202579b9bc9c7c74b2e1caf10300c1ae48c12d23 (patch) | |
| tree | bd70f33d8fb57708fb769ac5043953f499223986 /nova/api | |
| parent | be0c9e62840ae7bcff3e77a5b3bd664d3bda6d43 (diff) | |
| parent | dab6261216dab3879c45c4e89f29627a16d8db1a (diff) | |
Merge "Assign service_catalog in NovaKeystoneContext."
Diffstat (limited to 'nova/api')
| -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')) |