...
|
...
|
@@ -63,9 +63,6 @@ else
|
63
|
63
|
KEYSTONE_DEPLOY=mod_wsgi
|
64
|
64
|
fi
|
65
|
65
|
|
66
|
|
-# Select the token persistence backend driver
|
67
|
|
-KEYSTONE_TOKEN_BACKEND=${KEYSTONE_TOKEN_BACKEND:-sql}
|
68
|
|
-
|
69
|
66
|
# Select the Identity backend driver
|
70
|
67
|
KEYSTONE_IDENTITY_BACKEND=${KEYSTONE_IDENTITY_BACKEND:-sql}
|
71
|
68
|
|
...
|
...
|
@@ -79,7 +76,8 @@ KEYSTONE_ROLE_BACKEND=${KEYSTONE_ROLE_BACKEND:-sql}
|
79
|
79
|
KEYSTONE_RESOURCE_BACKEND=${KEYSTONE_RESOURCE_BACKEND:-sql}
|
80
|
80
|
|
81
|
81
|
# Select Keystone's token provider (and format)
|
82
|
|
-# Choose from 'uuid', 'pki', 'pkiz', or 'fernet'
|
|
82
|
+# Refer keystone doc for supported token provider:
|
|
83
|
+# https://docs.openstack.org/keystone/latest/admin/token-provider.html
|
83
|
84
|
KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-fernet}
|
84
|
85
|
KEYSTONE_TOKEN_FORMAT=$(echo ${KEYSTONE_TOKEN_FORMAT} | tr '[:upper:]' '[:lower:]')
|
85
|
86
|
|
...
|
...
|
@@ -245,8 +243,6 @@ function configure_keystone {
|
245
|
245
|
|
246
|
246
|
iniset $KEYSTONE_CONF database connection `database_connection_url keystone`
|
247
|
247
|
|
248
|
|
- iniset $KEYSTONE_CONF token driver "$KEYSTONE_TOKEN_BACKEND"
|
249
|
|
-
|
250
|
248
|
# Set up logging
|
251
|
249
|
if [ "$SYSLOG" != "False" ]; then
|
252
|
250
|
iniset $KEYSTONE_CONF DEFAULT use_syslog "True"
|
...
|
...
|
@@ -443,11 +439,6 @@ function init_keystone {
|
443
|
443
|
$KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF db_sync
|
444
|
444
|
time_stop "dbsync"
|
445
|
445
|
|
446
|
|
- if [[ "$KEYSTONE_TOKEN_FORMAT" == "pki" || "$KEYSTONE_TOKEN_FORMAT" == "pkiz" ]]; then
|
447
|
|
- # Set up certificates
|
448
|
|
- rm -rf $KEYSTONE_CONF_DIR/ssl
|
449
|
|
- $KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF pki_setup
|
450
|
|
- fi
|
451
|
446
|
if [[ "$KEYSTONE_TOKEN_FORMAT" == "fernet" ]]; then
|
452
|
447
|
rm -rf "$KEYSTONE_CONF_DIR/fernet-keys/"
|
453
|
448
|
$KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF fernet_setup
|