Commit 6daede50 authored by Giorgos Korfiatis's avatar Giorgos Korfiatis
Browse files

cyclades: Rename poolsize settings for uniformity

Rename ASTAKOS_POOLSIZE to CYCLADES_ASTAKOSCLIENT_POOLIZE;
expose it to the conf file.
parent d81a9dd7
...@@ -157,8 +157,8 @@ Cyclades ...@@ -157,8 +157,8 @@ Cyclades
* Make 'type' attribute required for network create API request. * Make 'type' attribute required for network create API request.
* Networks not created to all Ganeti backends upon creation, they are instead * Networks not created to all Ganeti backends upon creation, they are instead
created to a backend only when a VM connects to the network. created to a backend only when a VM connects to the network.
* Add 'ASTAKOS_POOLSIZE' setting which tunes the size of the http connection * Add 'CYCLADES_ASTAKOSCLIENT_POOLSIZE' setting which tunes the size of the
pool to astakos. http connection pool to astakos.
* Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings * Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings
* Remove CYCLADES_USE_QUOTAHOLDER, CYCLADES_QUOTAHOLDER_TOKEN, * Remove CYCLADES_USE_QUOTAHOLDER, CYCLADES_QUOTAHOLDER_TOKEN,
CYCLADES_QUOTAHOLDER_URL, CYCLADES_QUOTAHOLDER_POOLSIZE settings CYCLADES_QUOTAHOLDER_URL, CYCLADES_QUOTAHOLDER_POOLSIZE settings
......
...@@ -107,3 +107,6 @@ ...@@ -107,3 +107,6 @@
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the # endpoints. Set this to False if you deploy cyclades-app/astakos-app on the
# same machine. # same machine.
#CYCLADES_PROXY_USER_SERVICES = True #CYCLADES_PROXY_USER_SERVICES = True
# Tune the size of the http connection pool to astakos.
#CYCLADES_ASTAKOSCLIENT_POOLSIZE = 50
...@@ -93,7 +93,7 @@ ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/' ...@@ -93,7 +93,7 @@ ASTAKOS_BASE_URL = 'https://accounts.example.synnefo.org/'
# Tune the size of the Astakos http client connection pool # Tune the size of the Astakos http client connection pool
# This limit the number of concurrent requests to Astakos. # This limit the number of concurrent requests to Astakos.
ASTAKOS_POOLSIZE = 50 CYCLADES_ASTAKOSCLIENT_POOLSIZE = 50
# Key for password encryption-decryption. After changing this setting, synnefo # Key for password encryption-decryption. After changing this setting, synnefo
# will be unable to decrypt all existing Backend passwords. You will need to # will be unable to decrypt all existing Backend passwords. You will need to
......
...@@ -78,7 +78,7 @@ _pithos_backend_pool = \ ...@@ -78,7 +78,7 @@ _pithos_backend_pool = \
POOL_SIZE, POOL_SIZE,
astakos_url=settings.ASTAKOS_BASE_URL, astakos_url=settings.ASTAKOS_BASE_URL,
service_token=settings.CYCLADES_SERVICE_TOKEN, service_token=settings.CYCLADES_SERVICE_TOKEN,
astakosclient_poolsize=settings.ASTAKOS_POOLSIZE, astakosclient_poolsize=settings.CYCLADES_ASTAKOSCLIENT_POOLSIZE,
db_connection=settings.BACKEND_DB_CONNECTION, db_connection=settings.BACKEND_DB_CONNECTION,
block_path=settings.BACKEND_BLOCK_PATH) block_path=settings.BACKEND_BLOCK_PATH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment