@@ -207,7 +207,7 @@ function configure_glance {

     iniset $GLANCE_CACHE_CONF DEFAULT use_syslog $SYSLOG

     iniset $GLANCE_CACHE_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/

     iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_url

-    iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_AUTH_URI/v3

+    iniset $GLANCE_CACHE_CONF DEFAULT auth_url $KEYSTONE_AUTH_URI

     iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_tenant_name

     iniset $GLANCE_CACHE_CONF DEFAULT admin_tenant_name $SERVICE_PROJECT_NAME

     iniuncomment $GLANCE_CACHE_CONF DEFAULT auth_user

@@ -226,7 +226,7 @@ function configure_neutron_new {

         iniset $NEUTRON_META_CONF agent root_helper_daemon "$NEUTRON_ROOTWRAP_DAEMON_CMD"

         # TODO(dtroyer): remove the v2.0 hard code below

-        iniset $NEUTRON_META_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI/v2.0

+        iniset $NEUTRON_META_CONF DEFAULT auth_url $KEYSTONE_SERVICE_URI

         configure_auth_token_middleware $NEUTRON_META_CONF neutron $NEUTRON_AUTH_CACHE_DIR DEFAULT

     fi

@@ -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_URI/v3"

+    iniset $NOVA_CONF neutron auth_url "$KEYSTONE_SERVICE_URI"

     iniset $NOVA_CONF neutron username neutron

     iniset $NOVA_CONF neutron password "$SERVICE_PASSWORD"

     iniset $NOVA_CONF neutron user_domain_name "Default"

@@ -368,7 +368,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_AUTH_URI/v3"

+    iniset $NOVA_CONF neutron auth_url "$KEYSTONE_AUTH_URI"

     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"

@@ -49,7 +49,7 @@ function configure_nova_hypervisor {

     iniset $NOVA_CONF ironic auth_type password

     iniset $NOVA_CONF ironic username admin

     iniset $NOVA_CONF ironic password $ADMIN_PASSWORD

-    iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI/v3

+    iniset $NOVA_CONF ironic auth_url $KEYSTONE_AUTH_URI

     iniset $NOVA_CONF ironic project_domain_id default

     iniset $NOVA_CONF ironic user_domain_id default

     iniset $NOVA_CONF ironic project_name demo

@@ -102,7 +102,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_URI/v3"

+    iniset $NOVA_CONF placement auth_url "$KEYSTONE_SERVICE_URI"

     iniset $NOVA_CONF placement username placement

     iniset $NOVA_CONF placement password "$SERVICE_PASSWORD"

     iniset $NOVA_CONF placement user_domain_name "$SERVICE_DOMAIN_NAME"