openstack/devstack
Code Issues Proposed changes

Reference keystone URIs rather than building URI

Browse Source 
lib/keystone sets KEYSTONE_AUTH_URI and KEYSTONE_SERVICE_URI that
other projects should use rather than building the URL themselves.
This will allow us to more easily drop the port altogether.

Change-Id: I7467aae680215f3045d32a088af2187e1eba8169
This commit is contained in:
Brant Knudson 2016-05-03 15:21:47 -05:00
parent 841fdafa0b
commit e86b91ba78
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/horizon
View File

@ -96,7 +96,7 @@ function configure_horizon {
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\" _horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
_horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3} _horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3}
_horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v3\"" _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_URI}/v3\""
if [ -f $SSL_BUNDLE_FILE ]; then if [ -f $SSL_BUNDLE_FILE ]; then
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\" _horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"

2
lib/neutron-legacy
View File

@ -456,7 +456,7 @@ function configure_neutron {
function create_nova_conf_neutron { function create_nova_conf_neutron {
iniset $NOVA_CONF DEFAULT use_neutron True iniset $NOVA_CONF DEFAULT use_neutron True
iniset $NOVA_CONF neutron auth_type "password" iniset $NOVA_CONF neutron auth_type "password"
iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3" iniset $NOVA_CONF neutron auth_url "$KEYSTONE_AUTH_URI/v3"
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME" iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME"
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD" iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"
iniset $NOVA_CONF neutron user_domain_name "$SERVICE_DOMAIN_NAME" iniset $NOVA_CONF neutron user_domain_name "$SERVICE_DOMAIN_NAME"

4
lib/swift
View File

@ -457,9 +457,7 @@ function configure_swift {
cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER} cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}
[filter:s3token] [filter:s3token]
paste.filter_factory = keystonemiddleware.s3_token:filter_factory paste.filter_factory = keystonemiddleware.s3_token:filter_factory
auth_port = ${KEYSTONE_AUTH_PORT} auth_uri = ${KEYSTONE_AUTH_URI}
auth_host = ${KEYSTONE_AUTH_HOST}
auth_protocol = ${KEYSTONE_AUTH_PROTOCOL}
cafile = ${SSL_BUNDLE_FILE} cafile = ${SSL_BUNDLE_FILE}
admin_user = swift admin_user = swift
admin_tenant_name = ${SERVICE_PROJECT_NAME} admin_tenant_name = ${SERVICE_PROJECT_NAME}