@@ -284,7 +284,7 @@ function configure_neutron_rootwrap {

 function configure_neutron_nova_new {

     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_SERVICE_URI/v3"

     iniset $NOVA_CONF neutron username neutron

     iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"

     iniset $NOVA_CONF neutron user_domain_name "Default"

@@ -631,7 +631,7 @@ function create_nova_conf {

 function init_nova_service_user_conf {

     iniset $NOVA_CONF service_user send_service_user_token True

     iniset $NOVA_CONF service_user auth_type password

-    iniset $NOVA_CONF service_user auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT"

+    iniset $NOVA_CONF service_user auth_url "$KEYSTONE_SERVICE_URI"

     iniset $NOVA_CONF service_user username nova

     iniset $NOVA_CONF service_user password "$SERVICE_PASSWORD"

     iniset $NOVA_CONF service_user user_domain_name "$SERVICE_DOMAIN_NAME"

@@ -100,7 +100,7 @@ function _config_placement_apache_wsgi {

 function configure_placement_nova_compute {

     iniset $NOVA_CONF placement auth_type "password"

-    iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_AUTH_PORT/v3"

+    iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_URI/v3"

     iniset $NOVA_CONF placement username placement

     iniset $NOVA_CONF placement password "$SERVICE_PASSWORD"

     iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME"

@@ -17,7 +17,7 @@

 #   - ``PUBLIC_NETWORK_NAME``

 #   - ``VIRT_DRIVER``

 #   - ``LIBVIRT_TYPE``

-#   - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone

+#   - ``KEYSTONE_SERVICE_URI``, ``KEYSTONE_SERVICE_URI_V3`` from lib/keystone

 #

 # Optional Dependencies:

 #

@@ -257,7 +257,7 @@ function configure_tempest {

     iniset $TEMPEST_CONFIG volume build_timeout $BUILD_TIMEOUT

     # Identity

-    iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:5000/v2.0/"

+    iniset $TEMPEST_CONFIG identity uri "$KEYSTONE_SERVICE_URI/v2.0/"

     iniset $TEMPEST_CONFIG identity uri_v3 "$KEYSTONE_SERVICE_URI_V3"

     iniset $TEMPEST_CONFIG identity user_lockout_failure_attempts $KEYSTONE_LOCKOUT_FAILURE_ATTEMPTS

     iniset $TEMPEST_CONFIG identity user_lockout_duration $KEYSTONE_LOCKOUT_DURATION