summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPete Zaitcev <zaitcev@kotori.zaitcev.us>2012-02-02 22:41:28 -0700
committerZiad Sawalha <github@highbridgellc.com>2012-02-03 17:07:08 -0600
commitbfe9abeaa8a7ec8403b8fae1a7a302aa0e060bf4 (patch)
treee78c99f648334a02093e43da725c989fa70ed2e3
parent6ebc246ba983bdfa03a65025f5b44212b125810b (diff)
downloadkeystone-bfe9abeaa8a7ec8403b8fae1a7a302aa0e060bf4.tar.gz
keystone-bfe9abeaa8a7ec8403b8fae1a7a302aa0e060bf4.tar.xz
keystone-bfe9abeaa8a7ec8403b8fae1a7a302aa0e060bf4.zip
Fix "KeyError: 'service-header-mappings'"
Someone changed the dashes for underscores in keystone.conf and forgot to update one place. Fix is trivial, tested to work. bug 925872 Change-Id: Ib448f55fb0a352b5782fe0241bb1977c1d1ab79b
-rw-r--r--keystone/frontends/legacy_token_auth.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/frontends/legacy_token_auth.py b/keystone/frontends/legacy_token_auth.py
index acfcb140..a63395d5 100644
--- a/keystone/frontends/legacy_token_auth.py
+++ b/keystone/frontends/legacy_token_auth.py
@@ -92,7 +92,8 @@ class AuthProtocol(object):
if "serviceCatalog" in auth:
services = auth["serviceCatalog"]
service_mappings = ast.literal_eval(
- self.conf["service-header-mappings"])
+ self.conf.get("service_header_mappings",
+ self.conf["service-header-mappings"]))
for service in services:
service_name = service["name"]
service_urls = ''