diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2013-07-23 21:16:01 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2013-07-24 12:34:48 -0500 |
| commit | 7b4fedeed3517a17d32dad820bae2a49dd6c3e1b (patch) | |
| tree | 137d94085943718da9e3457e409d7c67eb6a39a2 /keystone/token | |
| parent | c6b7dd8959f96e4b5bf282860245603ff94b0084 (diff) | |
| download | keystone-7b4fedeed3517a17d32dad820bae2a49dd6c3e1b.tar.gz keystone-7b4fedeed3517a17d32dad820bae2a49dd6c3e1b.tar.xz keystone-7b4fedeed3517a17d32dad820bae2a49dd6c3e1b.zip | |
default token format/provider handling
The Keystone server would print a warning when both the token
format and provider were set to the default.
Also, the Keystone server would not start if the format was
commented out and the provider was set to the uuid.Provider.
Fixes: bug 1204314
Change-Id: Id7db33a1f27c4986af153efc73b22db8c6a8942e
Diffstat (limited to 'keystone/token')
| -rw-r--r-- | keystone/token/provider.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keystone/token/provider.py b/keystone/token/provider.py index 2459f843..2864be6f 100644 --- a/keystone/token/provider.py +++ b/keystone/token/provider.py @@ -77,6 +77,10 @@ class Manager(manager.Manager): 'conflicts with keystone.conf [token] provider')) return CONF.token.provider else: + if not CONF.signing.token_format: + # No token provider and no format, so use default (PKI) + return PKI_PROVIDER + msg = _('keystone.conf [signing] token_format is deprecated in ' 'favor of keystone.conf [token] provider') if CONF.signing.token_format == 'PKI': |