Browse code
Reference keystone URIs rather than building URI
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
Brant Knudson authored on 2016/05/04 05:21:47Showing 3 changed files
| ... | ... |
@@ -96,7 +96,7 @@ function configure_horizon {
|
| 96 | 96 |
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
|
| 97 | 97 |
|
| 98 | 98 |
_horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3}
|
| 99 |
- _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v3\""
|
|
| 99 |
+ _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_URI}/v3\""
|
|
| 100 | 100 |
|
| 101 | 101 |
if [ -f $SSL_BUNDLE_FILE ]; then |
| 102 | 102 |
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"
|
| ... | ... |
@@ -456,7 +456,7 @@ function configure_neutron {
|
| 456 | 456 |
function create_nova_conf_neutron {
|
| 457 | 457 |
iniset $NOVA_CONF DEFAULT use_neutron True |
| 458 | 458 |
iniset $NOVA_CONF neutron auth_type "password" |
| 459 |
- iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3" |
|
| 459 |
+ iniset $NOVA_CONF neutron auth_url "$KEYSTONE_AUTH_URI/v3" |
|
| 460 | 460 |
iniset $NOVA_CONF neutron username "$Q_ADMIN_USERNAME" |
| 461 | 461 |
iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD" |
| 462 | 462 |
iniset $NOVA_CONF neutron user_domain_name "$SERVICE_DOMAIN_NAME" |
| ... | ... |
@@ -457,9 +457,7 @@ function configure_swift {
|
| 457 | 457 |
cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}
|
| 458 | 458 |
[filter:s3token] |
| 459 | 459 |
paste.filter_factory = keystonemiddleware.s3_token:filter_factory |
| 460 |
-auth_port = ${KEYSTONE_AUTH_PORT}
|
|
| 461 |
-auth_host = ${KEYSTONE_AUTH_HOST}
|
|
| 462 |
-auth_protocol = ${KEYSTONE_AUTH_PROTOCOL}
|
|
| 460 |
+auth_uri = ${KEYSTONE_AUTH_URI}
|
|
| 463 | 461 |
cafile = ${SSL_BUNDLE_FILE}
|
| 464 | 462 |
admin_user = swift |
| 465 | 463 |
admin_tenant_name = ${SERVICE_PROJECT_NAME}
|