openstack/devstack
Code Issues Proposed changes

Merge "Add an environment variable to enable extensions in keystone"

Browse Source
This commit is contained in:
Jenkins 2014-06-24 18:00:26 +00:00 committed by Gerrit Code Review
commit a26fc1815f
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/keystone
View File

@ -41,6 +41,10 @@ KEYSTONE_WSGI_DIR=${KEYSTONE_WSGI_DIR:-/var/www/keystone}
KEYSTONECLIENT_DIR=$DEST/python-keystoneclient KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
# Set up additional extensions, such as oauth1, federation
# Example of KEYSTONE_EXTENSIONS=oauth1,federation
KEYSTONE_EXTENSIONS=${KEYSTONE_EXTENSIONS:-}
# Select the backend for Keystone's service catalog # Select the backend for Keystone's service catalog
KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql} KEYSTONE_CATALOG_BACKEND=${KEYSTONE_CATALOG_BACKEND:-sql}
KEYSTONE_CATALOG=$KEYSTONE_CONF_DIR/default_catalog.templates KEYSTONE_CATALOG=$KEYSTONE_CONF_DIR/default_catalog.templates
@ -153,6 +157,8 @@ function configure_keystone {
KEYSTONE_PASTE_INI="$KEYSTONE_CONF" KEYSTONE_PASTE_INI="$KEYSTONE_CONF"
fi fi
configure_keystone_extensions
# Rewrite stock ``keystone.conf`` # Rewrite stock ``keystone.conf``
if is_service_enabled ldap; then if is_service_enabled ldap; then
@ -273,6 +279,25 @@ function configure_keystone {
fi fi
} }
function configure_keystone_extensions {
# Add keystone extension into keystone v3 application pipeline
local extension_value
local api_v3
local extension
local api_v3_extension
for extension_value in ${KEYSTONE_EXTENSIONS//,/ }; do
if [[ -z "${extension_value}" ]]; then
continue
fi
api_v3=$(iniget $KEYSTONE_PASTE_INI pipeline:api_v3 pipeline)
extension=$(echo $api_v3 | sed -ne "/${extension_value}/ p;" )
if [[ -z $extension ]]; then
api_v3_extension=$(echo $api_v3 | sed -ne "s/service_v3/${extension_value}_extension service_v3/p;" )
iniset $KEYSTONE_PASTE_INI pipeline:api_v3 pipeline "$api_v3_extension"
fi
done
}
# create_keystone_accounts() - Sets up common required keystone accounts # create_keystone_accounts() - Sets up common required keystone accounts
# Tenant User Roles # Tenant User Roles
@ -386,6 +411,14 @@ function init_keystone {
# Initialize keystone database # Initialize keystone database
$KEYSTONE_DIR/bin/keystone-manage db_sync $KEYSTONE_DIR/bin/keystone-manage db_sync
local extension_value
for extension_value in ${KEYSTONE_EXTENSIONS//,/ }; do
if [[ -z "${extension_value}" ]]; then
continue
fi
$KEYSTONE_DIR/bin/keystone-manage db_sync --extension "${extension_value}"
done
if [[ "$KEYSTONE_TOKEN_FORMAT" != "uuid" ]]; then if [[ "$KEYSTONE_TOKEN_FORMAT" != "uuid" ]]; then
# Set up certificates # Set up certificates
rm -rf $KEYSTONE_CONF_DIR/ssl rm -rf $KEYSTONE_CONF_DIR/ssl