@@ -96,7 +96,7 @@ function configure_horizon {

     _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_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

         _horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"

@@ -369,7 +369,7 @@ function configure_mutnauq {

 function create_nova_conf_neutron {

     iniset $NOVA_CONF DEFAULT use_neutron True

     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 password "$SERVICE_PASSWORD"

     iniset $NOVA_CONF neutron user_domain_name "$SERVICE_DOMAIN_NAME"

@@ -457,9 +457,7 @@ function configure_swift {

         cat <<EOF >>${SWIFT_CONFIG_PROXY_SERVER}

 [filter:s3token]

 paste.filter_factory = keystonemiddleware.s3_token:filter_factory

-auth_port = ${KEYSTONE_AUTH_PORT}

-auth_host = ${KEYSTONE_AUTH_HOST}

-auth_protocol = ${KEYSTONE_AUTH_PROTOCOL}

+auth_uri = ${KEYSTONE_AUTH_URI}

 cafile = ${SSL_BUNDLE_FILE}

 admin_user = swift

 admin_tenant_name = ${SERVICE_PROJECT_NAME}