Browse code
Add a variable to control keystone token format
This change lets the developer running devstack
control the token format used by keystone through
setting KEYSTONE_TOKEN_FORMAT in their localrc
file.
Change-Id: Ic1265fcb10b8de112891f61d5e07312322148ec2
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Doug Hellmann authored on 2012/10/27 01:24:28Showing 1 changed files
| ... | ... |
@@ -47,6 +47,7 @@ KEYSTONE_AUTH_PROTOCOL=${KEYSTONE_AUTH_PROTOCOL:-http}
|
| 47 | 47 |
KEYSTONE_SERVICE_HOST=${KEYSTONE_SERVICE_HOST:-$SERVICE_HOST}
|
| 48 | 48 |
KEYSTONE_SERVICE_PORT=${KEYSTONE_SERVICE_PORT:-5000}
|
| 49 | 49 |
KEYSTONE_SERVICE_PROTOCOL=${KEYSTONE_SERVICE_PROTOCOL:-http}
|
| 50 |
+KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKI}
|
|
| 50 | 51 |
|
| 51 | 52 |
|
| 52 | 53 |
# Entry Points |
| ... | ... |
@@ -82,6 +83,7 @@ function configure_keystone() {
|
| 82 | 82 |
|
| 83 | 83 |
# Rewrite stock ``keystone.conf`` |
| 84 | 84 |
iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN" |
| 85 |
+ iniset $KEYSTONE_CONF signing token_format "$KEYSTONE_TOKEN_FORMAT" |
|
| 85 | 86 |
iniset $KEYSTONE_CONF sql connection "$BASE_SQL_CONN/keystone?charset=utf8" |
| 86 | 87 |
iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2" |
| 87 | 88 |
sed -e " |