@@ -939,8 +939,12 @@ function _neutron_setup_keystone {

     local use_auth_url=$3

     local skip_auth_cache=$4

-    iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI

-    iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI

+    if [[ -n $use_auth_url ]]; then

+        iniset $conf_file $section auth_url $KEYSTONE_SERVICE_URI/v2.0

+    else

+        iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI

+        iniset $conf_file $section identity_uri $KEYSTONE_AUTH_URI

+    fi

     iniset $conf_file $section admin_tenant_name $SERVICE_TENANT_NAME

     iniset $conf_file $section admin_user $Q_ADMIN_USERNAME

     iniset $conf_file $section admin_password $SERVICE_PASSWORD