diff options
| author | Guang Yee <guang.yee@hp.com> | 2013-07-18 08:23:52 -0700 |
|---|---|---|
| committer | Guang Yee <guang.yee@hp.com> | 2013-07-18 09:28:42 -0700 |
| commit | e63501d305c67b898821ad65ec744adf6851236a (patch) | |
| tree | a9d3430185972de6f26ff1cef76525f8fc530fa1 /etc | |
| parent | c42533fc00210a16d6eb74909adaeddb9bc4fbf6 (diff) | |
| download | keystone-e63501d305c67b898821ad65ec744adf6851236a.tar.gz keystone-e63501d305c67b898821ad65ec744adf6851236a.tar.xz keystone-e63501d305c67b898821ad65ec744adf6851236a.zip | |
Support token_format for backward compatibility
The provider property in the [token] section will be unset by default. If
provider is not set, we will use token_format in the [signing] section to
determine to provider. If provider is set, it must agree with the token_format.
fixed bug 1202651
Change-Id: I15ff67490acbbacc9eefc7eee253400475704b04
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/keystone.conf.sample | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample index 43884951..509165c5 100644 --- a/etc/keystone.conf.sample +++ b/etc/keystone.conf.sample @@ -161,7 +161,9 @@ #cert_subject = /C=US/ST=Unset/L=Unset/O=Unset/CN=localhost [signing] +# Deprecated in favor of provider in the [token] section #token_format = PKI + #certfile = /etc/keystone/pki/certs/signing_cert.pem #keyfile = /etc/keystone/pki/private/signing_key.pem #ca_certs = /etc/keystone/pki/certs/cacert.pem |