Revision 28c41829

b/Changelog
30 30

  
31 31
Cyclades
32 32
--------
33
* Add 'ASTAKOS_POOLSIZE' setting which tunes the size of the http connection
34
  pool to astakos.
33 35
* Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings
34 36
* Remove CYCLADES_USE_QUOTAHOLDER, CYCLADES_QUOTAHOLDER_TOKEN,
35 37
  CYCLADES_QUOTAHOLDER_URL, CYCLADES_QUOTAHOLDER_POOLSIZE settings
b/snf-cyclades-app/synnefo/app_settings/default/__init__.py
40 40
from synnefo.app_settings.default.reconciliation import *
41 41
from synnefo.app_settings.default.tests import *
42 42
from synnefo.app_settings.default.cloudbar import *
43
from synnefo.app_settings.default.quotas import *
b/snf-cyclades-app/synnefo/app_settings/default/api.py
98 98
# The URL of an astakos instance that will be used for user authentication
99 99
ASTAKOS_URL = 'https://accounts.example.org/'
100 100

  
101
# Tune the size of the Astakos http client connection pool
102
# This limit the number of concurrent requests to Astakos.
103
ASTAKOS_POOLSIZE = 50
104

  
101 105
# Key for password encryption-decryption. After changing this setting, synnefo
102 106
# will be unable to decrypt all existing Backend passwords. You will need to
103 107
# store again the new password by using 'snf-manage backend-modify'.
104 108
# SECRET_ENCRYPTION_KEY may up to 32 bytes. Keys bigger than 32 bytes are not
105 109
# supported.
106
SECRET_ENCRYPTION_KEY= "Password Encryption Key"
110
SECRET_ENCRYPTION_KEY = "Password Encryption Key"
107 111

  
108 112
# Astakos service token
109 113
# The token used for astakos service api calls (e.g. api to retrieve user email
b/snf-cyclades-app/synnefo/plankton/backend.py
78 78
        POOL_SIZE,
79 79
        astakos_url=settings.ASTAKOS_URL,
80 80
        service_token=settings.CYCLADES_ASTAKOS_SERVICE_TOKEN,
81
        astakosclient_poolsize=settings.CYCLADES_QUOTAHOLDER_POOLSIZE,
81
        astakosclient_poolsize=settings.ASTAKOS_POOLSIZE,
82 82
        db_connection=settings.BACKEND_DB_CONNECTION,
83 83
        block_path=settings.BACKEND_BLOCK_PATH)
84 84

  

Also available in: Unified diff