diff options
author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-08-29 13:55:40 -0500 |
---|---|---|
committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-08-29 13:55:40 -0500 |
commit | 2759c2239862ebe9bf7b6656936c65753e5c2cfc (patch) | |
tree | 41a3a64e10a544921fc8956823ae09199a9b7b24 /keystone/middleware | |
parent | 035a956f205f10cbd4144c6bd005f912705202c8 (diff) | |
download | keystone-2759c2239862ebe9bf7b6656936c65753e5c2cfc.tar.gz keystone-2759c2239862ebe9bf7b6656936c65753e5c2cfc.tar.xz keystone-2759c2239862ebe9bf7b6656936c65753e5c2cfc.zip |
Check for expected cfg impl (bug 1043479)
Change-Id: Id2ac85d4ac61713c0ca8e2c10e68cbdeeadff4cb
Diffstat (limited to 'keystone/middleware')
-rw-r--r-- | keystone/middleware/auth_token.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py index 5f9828b0..1f565eb3 100644 --- a/keystone/middleware/auth_token.py +++ b/keystone/middleware/auth_token.py @@ -120,7 +120,7 @@ except ImportError: cfg = __import__('%s.openstack.common.cfg' % app, fromlist=['%s.openstack.common' % app]) # test which application middleware is running in - if 'config_file' in cfg.CONF: + if hasattr(cfg, 'CONF') and 'config_file' in cfg.CONF: CONF = cfg.CONF break except ImportError: |