openstack/barbican
Code Issues Proposed changes

Merge "Drop configure_keystone_authtoken_middleware function"

Browse Source
This commit is contained in:
Zuul 2020-08-25 14:26:48 +00:00 committed by Gerrit Code Review
commit 4c479ebb50
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/barbican
View File

@ -164,7 +164,7 @@ function configure_barbican {
iniset $BARBICAN_PASTE_CONF 'pipeline:barbican_api' pipeline 'barbican-api-keystone'
# Set the keystone parameters
configure_auth_token_middleware $BARBICAN_CONF barbican $BARBICAN_AUTH_CACHE_DIR
configure_keystone_authtoken_middleware $BARBICAN_CONF barbican
# Enable the keystone listener
iniset $BARBICAN_CONF keystone_notifications enable True
@ -173,11 +173,6 @@ function configure_barbican {
# init_barbican - Initialize etc.
function init_barbican {
# Create cache dir
sudo mkdir -p $BARBICAN_AUTH_CACHE_DIR
sudo chown $STACK_USER $BARBICAN_AUTH_CACHE_DIR
rm -f $BARBICAN_AUTH_CACHE_DIR/*
recreate_database barbican utf8
$BARBICAN_BIN_DIR/barbican-manage db upgrade -v head

1
devstack/settings
View File

@ -9,7 +9,6 @@ BARBICAN_CONF_DIR=${BARBICAN_CONF_DIR:-/etc/barbican}
BARBICAN_CONF=$BARBICAN_CONF_DIR/barbican.conf
BARBICAN_PASTE_CONF=$BARBICAN_CONF_DIR/barbican-api-paste.ini
BARBICAN_API_LOG_DIR=$DEST/logs
BARBICAN_AUTH_CACHE_DIR=${BARBICAN_AUTH_CACHE_DIR:-/var/cache/barbican}
PYKMIP_CONF_DIR=${PYKMIP_CONF_DIR:-/etc/pykmip}
PYKMIP_CONF=${PYKMIP_CONF_DIR}/server.conf