Skip to content

Commit 2742875

Browse files
author
ghanshyam
committed
Cleanup keystone's removed config options
token.provider.drvier.uuid and token.driver has been removed from keystone[1]. Devstack has reference/setting of those config options which is confusing for user and it can lead to import error like[2] This commit cleanup the devstack bits of removed config options. bp removed-as-of-rocky [1] https://blueprints.launchpad.net/keystone/+spec/removed-as-of-rocky [2] http://paste.openstack.org/show/725391/ Change-Id: I29b3b356622c485c4c1046679234a38e7b645071
1 parent 5da7e4a commit 2742875

1 file changed

Lines changed: 2 additions & 11 deletions

File tree

lib/keystone

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ else
6363
KEYSTONE_DEPLOY=mod_wsgi
6464
fi
6565

66-
# Select the token persistence backend driver
67-
KEYSTONE_TOKEN_BACKEND=${KEYSTONE_TOKEN_BACKEND:-sql}
68-
6966
# Select the Identity backend driver
7067
KEYSTONE_IDENTITY_BACKEND=${KEYSTONE_IDENTITY_BACKEND:-sql}
7168

@@ -79,7 +76,8 @@ KEYSTONE_ROLE_BACKEND=${KEYSTONE_ROLE_BACKEND:-sql}
7976
KEYSTONE_RESOURCE_BACKEND=${KEYSTONE_RESOURCE_BACKEND:-sql}
8077

8178
# Select Keystone's token provider (and format)
82-
# Choose from 'uuid', 'pki', 'pkiz', or 'fernet'
79+
# Refer keystone doc for supported token provider:
80+
# https://docs.openstack.org/keystone/latest/admin/token-provider.html
8381
KEYSTONE_TOKEN_FORMAT=${KEYSTONE_TOKEN_FORMAT:-fernet}
8482
KEYSTONE_TOKEN_FORMAT=$(echo ${KEYSTONE_TOKEN_FORMAT} | tr '[:upper:]' '[:lower:]')
8583

@@ -245,8 +243,6 @@ function configure_keystone {
245243

246244
iniset $KEYSTONE_CONF database connection `database_connection_url keystone`
247245

248-
iniset $KEYSTONE_CONF token driver "$KEYSTONE_TOKEN_BACKEND"
249-
250246
# Set up logging
251247
if [ "$SYSLOG" != "False" ]; then
252248
iniset $KEYSTONE_CONF DEFAULT use_syslog "True"
@@ -443,11 +439,6 @@ function init_keystone {
443439
$KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF db_sync
444440
time_stop "dbsync"
445441

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
451442
if [[ "$KEYSTONE_TOKEN_FORMAT" == "fernet" ]]; then
452443
rm -rf "$KEYSTONE_CONF_DIR/fernet-keys/"
453444
$KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF fernet_setup

0 commit comments

Comments
 (0)