openstack/devstack
Code Issues Proposed changes

Improve savanna keystone auth configuration

Browse Source 
We're doing to use common keystone configuration approach - section
keystone_authtoken with config opts from the python-keystoneclient
auth_token middleware.

Change-Id: Ibbe0c76ee3b00045f5cb5134bd7661e9cef6ccdd
This commit is contained in:
Sergey Lukjanov 2014-02-19 14:00:42 +04:00
parent 2dcc774223
commit de2057290a
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extras.d/70-savanna.sh
View File

@ -8,6 +8,7 @@ if is_service_enabled savanna; then
elif [[ "$1" == "stack" && "$2" == "install" ]]; then elif [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Savanna" echo_summary "Installing Savanna"
install_savanna install_savanna
cleanup_savanna
if is_service_enabled horizon; then if is_service_enabled horizon; then
install_savanna_dashboard install_savanna_dashboard
fi fi
@ -29,4 +30,8 @@ if is_service_enabled savanna; then
cleanup_savanna_dashboard cleanup_savanna_dashboard
fi fi
fi fi
if [[ "$1" == "clean" ]]; then
cleanup_savanna
fi
fi fi

29
lib/savanna
View File

@ -10,6 +10,7 @@
# configure_savanna # configure_savanna
# start_savanna # start_savanna
# stop_savanna # stop_savanna
# cleanup_savanna
# Save trace setting # Save trace setting
XTRACE=$(set +o | grep xtrace) XTRACE=$(set +o | grep xtrace)
@ -33,6 +34,8 @@ SAVANNA_SERVICE_HOST=${SAVANNA_SERVICE_HOST:-$SERVICE_HOST}
SAVANNA_SERVICE_PORT=${SAVANNA_SERVICE_PORT:-8386} SAVANNA_SERVICE_PORT=${SAVANNA_SERVICE_PORT:-8386}
SAVANNA_SERVICE_PROTOCOL=${SAVANNA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} SAVANNA_SERVICE_PROTOCOL=${SAVANNA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
SAVANNA_AUTH_CACHE_DIR=${SAVANNA_AUTH_CACHE_DIR:-/var/cache/savanna}
# Support entry points installation of console scripts # Support entry points installation of console scripts
if [[ -d $SAVANNA_DIR/bin ]]; then if [[ -d $SAVANNA_DIR/bin ]]; then
SAVANNA_BIN_DIR=$SAVANNA_DIR/bin SAVANNA_BIN_DIR=$SAVANNA_DIR/bin
@ -83,6 +86,14 @@ function create_savanna_accounts() {
fi fi
} }
# cleanup_savanna() - Remove residual data files, anything left over from
# previous runs that would need to clean up.
function cleanup_savanna() {
# Cleanup auth cache dir
sudo rm -rf $SAVANNA_AUTH_CACHE_DIR
}
# configure_savanna() - Set config files, create data dirs, etc # configure_savanna() - Set config files, create data dirs, etc
function configure_savanna() { function configure_savanna() {
@ -94,9 +105,27 @@ function configure_savanna() {
# Copy over savanna configuration file and configure common parameters. # Copy over savanna configuration file and configure common parameters.
cp $SAVANNA_DIR/etc/savanna/savanna.conf.sample $SAVANNA_CONF_FILE cp $SAVANNA_DIR/etc/savanna/savanna.conf.sample $SAVANNA_CONF_FILE
# Create auth cache dir
sudo mkdir -p $SAVANNA_AUTH_CACHE_DIR
sudo chown $STACK_USER $SAVANNA_AUTH_CACHE_DIR
rm -rf $SAVANNA_AUTH_CACHE_DIR/*
# Set obsolete keystone auth configs for backward compatibility
iniset $SAVANNA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_SERVICE_HOST
iniset $SAVANNA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_SERVICE_PORT
iniset $SAVANNA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_SERVICE_PROTOCOL
iniset $SAVANNA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD iniset $SAVANNA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD
iniset $SAVANNA_CONF_FILE DEFAULT os_admin_username savanna iniset $SAVANNA_CONF_FILE DEFAULT os_admin_username savanna
iniset $SAVANNA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME iniset $SAVANNA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME
# Set actual keystone auth configs
iniset $SAVANNA_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/
iniset $SAVANNA_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
iniset $SAVANNA_CONF_FILE keystone_authtoken admin_user savanna
iniset $SAVANNA_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
iniset $SAVANNA_CONF_FILE keystone_authtoken signing_dir $SAVANNA_AUTH_CACHE_DIR
iniset $SAVANNA_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA
iniset $SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG iniset $SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG
iniset $SAVANNA_CONF_FILE database connection `database_connection_url savanna` iniset $SAVANNA_CONF_FILE database connection `database_connection_url savanna`