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 /etc | |
| 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 'etc')
| -rw-r--r-- | etc/keystone.conf.sample | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 4c0327cf..a49a9a5e 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -128,7 +128,8 @@ # driver = keystone.token.backends.sql.Token # Controls the token construction, validation, and revocation operations. -# provider = keystone.token.providers.pki.Provider +# Core providers are keystone.token.providers.[pki|uuid].Provider +# provider = # Amount of time a token should remain valid (in seconds) # expiration = 86400 @@ -165,7 +166,8 @@ [signing] # Deprecated in favor of provider in the [token] section -#token_format = PKI +# Allowed values are PKI or UUID +#token_format = #certfile = /etc/keystone/pki/certs/signing_cert.pem #keyfile = /etc/keystone/pki/private/signing_key.pem |