openstack
/
blazar
Code Issues Proposed changes

Enable DevStack to set Keystone service name in config 

With default DevStack settings, the Keystone service name is defined as
'identity'. However, Blazar expects it to be 'identityv3' by default. It
is used to get the corresponding Keystone endpoint from the service
catalog.

This patch makes the value configurable, which Jenkins jobs can use to
set the Keystone service name.

Change-Id: I9fdd4207d31364697e9721db5ea96ccc34efbbe7
This commit is contained in:
Masahito Muroi 2017-01-20 01:41:30 +09:00 committed by Pierre Riteau
parent a901c3823a
commit 7019dc736b
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -48,6 +48,7 @@ function configure_blazar {
iniset $BLAZAR_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD
iniset $BLAZAR_CONF_FILE DEFAULT os_admin_username blazar
iniset $BLAZAR_CONF_FILE DEFAULT os_admin_project_name $SERVICE_TENANT_NAME
iniset $BLAZAR_CONF_FILE DEFAULT identity_service $BLAZAR_IDENTITY_SERVICE_NAME
# keystone authtoken
iniset $BLAZAR_CONF_FILE keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL

2
devstack/settings
View File

@ -30,6 +30,8 @@ BLAZAR_SERVICE_HOST=${BLAZAR_SERVICE_HOST:-$SERVICE_HOST}
BLAZAR_SERVICE_PORT=${BLAZAR_SERVICE_PORT:-1234}
BLAZAR_SERVICE_PROTOCOL=${BLAZAR_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
# Blazar specific configurations
BLAZAR_IDENTITY_SERVICE_NAME=${BLAZAR_IDENTITY_SERVICE_NAME:-"identityv3"}
BLAZAR_FREEPOOL_NAME=${BLAZAR_FREEPOOL_NAME:-freepool}
# Tell Tempest this project is present