Revision 48646327

b/Changelog
39 39
    Project and ProjectMembership, previously needed for syncing; removed
40 40
    state PROJECT_DEACTIVATED from ProjectMembership.
41 41

  
42
  * Removed settings ASTAKOS_QUOTAHOLDER_URL, ASTAKOS_QUOTAHOLDER_TOKEN,
43
    and ASTAKOS_QUOTAHOLDER_POOLSIZE.
44

  
42 45
* Service and resource specification and handling:
43 46

  
44 47
  * Specified a format for defining resources a service exposes. Migrated
b/docs/quick-install-admin-guide.rst
631 631
        MIDDLEWARE_CLASSES.remove('django.middleware.csrf.CsrfViewMiddleware')
632 632
        TEMPLATE_CONTEXT_PROCESSORS.remove('django.core.context_processors.csrf')
633 633

  
634
Since version 0.13 you need to configure some basic settings for the new *Quota*
635
feature.
636

  
637
Specifically:
638

  
639
Edit ``/etc/synnefo/20-snf-astakos-app-settings.conf``:
640

  
641
.. code-block:: console
642

  
643
    QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
644
    QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
645
    ASTAKOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
646
    ASTAKOS_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
647

  
648 634
Enable Pooling
649 635
--------------
650 636

  
......
855 841

  
856 842
   PITHOS_SERVICE_TOKEN = 'pithos_service_token22w=='
857 843

  
858
   PITHOS_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
859
   PITHOS_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
860
   PITHOS_USE_QUOTAHOLDER = True
861

  
862 844
   # Set to False if astakos & pithos are on the same host
863 845
   #PITHOS_PROXY_USER_SERVICES = True
864 846

  
b/docs/scale/i-astakos.rst
70 70
    ASTAKOS_EMAIL_CHANGE_EMAIL_SUBJECT = 'Email change on %s' % ASTAKOS_SITENAME
71 71
    ASTAKOS_PASSWORD_RESET_EMAIL_SUBJECT = 'Password reset on %s' % ASTAKOS_SITENAME
72 72

  
73
    ASTAKOS_QUOTAHOLDER_TOKEN = '1234'
74
    ASTAKOS_QUOTAHOLDER_URL = 'https://qh.example.com/quotaholder/v'
75

  
76 73
    EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
77 74
    ASTAKOS_SERVICES = {
78 75
        'cyclades': {
b/docs/scale/i-pithos.rst
65 65
    PITHOS_UPDATE_MD5 = False
66 66
    PITHOS_SERVICE_TOKEN = 'XXXXXXXXXXX'
67 67

  
68
    PITHOS_QUOTAHOLDER_TOKEN = '1234'
69
    PITHOS_QUOTAHOLDER_URL = 'https://qh.example.com/quotaholder/v'
70

  
71 68
    # Set False if astakos & pithos are on the same node
72 69
    PITHOS_PROXY_USER_SERVICES = True
73
    PITHOS_USE_QUOTAHOLDER = True
74 70

  
75 71

  
76 72
Install pithos web UI with:
b/snf-astakos-app/astakos/im/settings.py
160 160
    settings, 'ASTAKOS_PROJECT_MEMBERSHIP_LEAVE_REQUEST_SUBJECT',
161 161
    '%s testing project membership leave request (%%(name)s)' % SITENAME)
162 162

  
163
# Set the quota holder component URI
164
QUOTAHOLDER_URL = getattr(settings, 'ASTAKOS_QUOTAHOLDER_URL', '')
165
QUOTAHOLDER_TOKEN = getattr(settings, 'ASTAKOS_QUOTAHOLDER_TOKEN', '')
166
QUOTAHOLDER_POOLSIZE = getattr(settings, 'ASTAKOS_QUOTAHOLDER_POOLSIZE', 50)
167

  
168 163
# Set how many objects should be displayed per page
169 164
PAGINATE_BY = getattr(settings, 'ASTAKOS_PAGINATE_BY', 8)
170 165

  
b/snf-astakos-app/astakos/test/settings/local.conf
18 18

  
19 19
HOST   = 'http://127.0.0.1'
20 20

  
21
QUOTAHOLDER_URL = HOST + ':8008/quotaholder/v'
22
QUOTAHOLDER_TOKEN = 'token'
23

  
24 21
ASTAKOS_URL = HOST + ':8000/astakos/api/authenticate'
25 22
ASTAKOS_BASEURL = HOST + ':8000/'
26 23
ASTAKOS_IM_MODULES = ['local']
27 24
ASTAKOS_RECAPTCHA_ENABLED = False
28

  
29
ASTAKOS_QUOTAHOLDER_URL = HOST + ':8008/quotaholder/v'
30
ASTAKOS_QUOTAHOLDER_TOKEN = 'token'
b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf
102 102
#ASTAKOS_PROJECT_SUSPENSION_SUBJECT = '%s project suspended (%%(name)s)' % SITENAME
103 103
#ASTAKOS_PROJECT_MEMBERSHIP_CHANGE_SUBJECT = '%s project membership changed (%%(name)s)' % SITENAME
104 104

  
105
# Set the quotaholder component URI and token
106
#ASTAKOS_QUOTAHOLDER_URL = ''
107
#ASTAKOS_QUOTAHOLDER_TOKEN = ''
108
#
109
# Tune the size of the quotaholder http client connection pool.
110
# This limits the number of concurrent requests to quotaholder.
111
# If quotaholder is installed in the same system as astakos,
112
# This must be at most half the synnefo_poolsize for the django database
113
#ASTAKOS_QUOTAHOLDER_POOLSIZE = 50
114

  
115
# Setup quotaholder URL and token when snf-quotaholder-app is installed
116
# in the same server as astakos (recommended)
117
#QUOTAHOLDER_URL = ''
118
#QUOTAHOLDER_TOKEN = ''
119

  
120 105
# Set the cloud service properties
121 106
#ASTAKOS_SERVICES = {
122 107
#    'cyclades': {

Also available in: Unified diff