...
|
...
|
@@ -56,7 +56,7 @@ KEYSTONE_ASSIGNMENT_BACKEND=${KEYSTONE_ASSIGNMENT_BACKEND:-sql}
|
56
|
56
|
|
57
|
57
|
# Select Keystone's token format
|
58
|
58
|
# Choose from 'UUID', 'PKI', or 'PKIZ'
|
59
|
|
-KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-PKIZ}
|
|
59
|
+KEYSTONE_TOKEN_FORMAT=$(echo ${KEYSTONE_TOKEN_FORMAT} | tr '[:upper:]' '[:lower:]')
|
60
|
60
|
|
61
|
61
|
# Set Keystone interface configuration
|
62
|
62
|
KEYSTONE_AUTH_HOST=${KEYSTONE_AUTH_HOST:-$SERVICE_HOST}
|
...
|
...
|
@@ -204,10 +204,8 @@ function configure_keystone {
|
204
|
204
|
|
205
|
205
|
iniset $KEYSTONE_CONF DEFAULT admin_token "$SERVICE_TOKEN"
|
206
|
206
|
|
207
|
|
- if [[ "$KEYSTONE_TOKEN_FORMAT" = "UUID" ]]; then
|
208
|
|
- iniset $KEYSTONE_CONF token provider keystone.token.providers.uuid.Provider
|
209
|
|
- elif [[ "$KEYSTONE_TOKEN_FORMAT" = "PKI" ]]; then
|
210
|
|
- iniset $KEYSTONE_CONF token provider keystone.token.providers.pki.Provider
|
|
207
|
+ if [[ "$KEYSTONE_TOKEN_FORMAT" != "" ]]; then
|
|
208
|
+ iniset $KEYSTONE_CONF token provider keystone.token.providers.$KEYSTONE_TOKEN_FORMAT.Provider
|
211
|
209
|
fi
|
212
|
210
|
|
213
|
211
|
iniset $KEYSTONE_CONF database connection `database_connection_url keystone`
|
...
|
...
|
@@ -388,7 +386,7 @@ function init_keystone {
|
388
|
388
|
# Initialize keystone database
|
389
|
389
|
$KEYSTONE_DIR/bin/keystone-manage db_sync
|
390
|
390
|
|
391
|
|
- if [[ "$KEYSTONE_TOKEN_FORMAT" == "PKI" || "$KEYSTONE_TOKEN_FORMAT" == "PKIZ" ]]; then
|
|
391
|
+ if [[ "$KEYSTONE_TOKEN_FORMAT" != "uuid" ]]; then
|
392
|
392
|
# Set up certificates
|
393
|
393
|
rm -rf $KEYSTONE_CONF_DIR/ssl
|
394
|
394
|
$KEYSTONE_DIR/bin/keystone-manage pki_setup
|