Merge "Support for separate Keystone paste.deploy configuration"
This commit is contained in:
commit
e7f0c7be6d
16
lib/keystone
16
lib/keystone
@ -31,6 +31,7 @@ set +o xtrace
|
||||
KEYSTONE_DIR=$DEST/keystone
|
||||
KEYSTONE_CONF_DIR=${KEYSTONE_CONF_DIR:-/etc/keystone}
|
||||
KEYSTONE_CONF=$KEYSTONE_CONF_DIR/keystone.conf
|
||||
KEYSTONE_PASTE_INI=${KEYSTONE_PASTE_INI:-$KEYSTONE_CONF_DIR/keystone-paste.ini}
|
||||
KEYSTONE_AUTH_CACHE_DIR=${KEYSTONE_AUTH_CACHE_DIR:-/var/cache/keystone}
|
||||
|
||||
KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
|
||||
@ -88,6 +89,15 @@ function configure_keystone() {
|
||||
if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then
|
||||
cp -p $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF
|
||||
cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR
|
||||
if [[ -f "$KEYSTONE_DIR/etc/keystone-paste.ini" ]]; then
|
||||
cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI"
|
||||
fi
|
||||
fi
|
||||
if [[ -f "$KEYSTONE_PASTE_INI" ]]; then
|
||||
iniset "$KEYSTONE_CONF" paste_deploy config_file "$KEYSTONE_PASTE_INI"
|
||||
else
|
||||
# compatibility with mixed cfg and paste.deploy configuration
|
||||
KEYSTONE_PASTE_INI="$KEYSTONE_CONF"
|
||||
fi
|
||||
|
||||
# Rewrite stock ``keystone.conf``
|
||||
@ -123,12 +133,6 @@ function configure_keystone() {
|
||||
iniset $KEYSTONE_CONF signing token_format "$KEYSTONE_TOKEN_FORMAT"
|
||||
iniset $KEYSTONE_CONF sql connection `database_connection_url keystone`
|
||||
iniset $KEYSTONE_CONF ec2 driver "keystone.contrib.ec2.backends.sql.Ec2"
|
||||
sed -e "
|
||||
/^pipeline.*ec2_extension crud_/s|ec2_extension crud_extension|ec2_extension s3_extension crud_extension|;
|
||||
" -i $KEYSTONE_CONF
|
||||
|
||||
# Append the S3 bits
|
||||
iniset $KEYSTONE_CONF filter:s3_extension paste.filter_factory "keystone.contrib.s3:S3Extension.factory"
|
||||
|
||||
if [[ "$KEYSTONE_TOKEN_BACKEND" = "sql" ]]; then
|
||||
iniset $KEYSTONE_CONF token driver keystone.token.backends.sql.Token
|
||||
|
Loading…
x
Reference in New Issue
Block a user