Revision b17e5550 snf-pithos-app/pithos/api/util.py

b/snf-pithos-app/pithos/api/util.py
54 54
                                 BACKEND_BLOCK_MODULE, BACKEND_BLOCK_PATH,
55 55
                                 BACKEND_BLOCK_UMASK,
56 56
                                 BACKEND_QUEUE_MODULE, BACKEND_QUEUE_HOSTS,
57
                                 BACKEND_QUEUE_EXCHANGE, USE_QUOTAHOLDER,
58
                                 QUOTAHOLDER_URL, QUOTAHOLDER_TOKEN,
57
                                 BACKEND_QUEUE_EXCHANGE,
59 58
                                 QUOTAHOLDER_POOLSIZE,
59
                                 SERVICE_TOKEN,
60 60
                                 ASTAKOS_URL,
61 61
                                 BACKEND_ACCOUNT_QUOTA, BACKEND_CONTAINER_QUOTA,
62 62
                                 BACKEND_VERSIONING,
......
953 953
        queue_module=BACKEND_QUEUE_MODULE,
954 954
        queue_hosts=BACKEND_QUEUE_HOSTS,
955 955
        queue_exchange=BACKEND_QUEUE_EXCHANGE,
956
        quotaholder_enabled=USE_QUOTAHOLDER,
957
        quotaholder_url=QUOTAHOLDER_URL,
958
        quotaholder_token=QUOTAHOLDER_TOKEN,
956
        quotaholder_enabled=True,
957
        quotaholder_url=ASTAKOS_URL,
958
        quotaholder_token=SERVICE_TOKEN,
959 959
        quotaholder_client_poolsize=QUOTAHOLDER_POOLSIZE,
960 960
        free_versioning=BACKEND_FREE_VERSIONING,
961 961
        block_params=BLOCK_PARAMS,
......
1009 1009
    user_info = user_for_token(token, astakos_url, usage=True)
1010 1010
    usage = user_info.get("usage", [])
1011 1011
    for u in usage:
1012
        if u.get('name') == 'pithos+.diskspace':
1012
        if u.get('name') == 'pithos.diskspace':
1013 1013
            return u
1014 1014

  
1015 1015

  

Also available in: Unified diff