Commit 47413b6e authored by Christos Stavrakakis's avatar Christos Stavrakakis

Cyclades: remove all quotaholder settings

Remove from cyclades all settings that were relative with Quotaholder.
Remove CYCLADES_USE_QUOTAHOLDER settings, since Cyclades can not work
any more without quotas.
Remove CYCLADES_QUOTAHOLDER_URL and CYCLADES_QUOTAHOLDER_TOKEN since
Quotaholder is merged with Astakos.
parent 59ce6ec5
......@@ -25,6 +25,8 @@ Astakos
Cyclades
--------
* Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings
* Remove CYCLADES_USE_QUOTAHOLDER, CYCLADES_QUOTAHOLDER_TOKEN,
CYCLADES_QUOTAHOLDER_URL, CYCLADES_QUOTAHOLDER_POOLSIZE settings
Pithos
------
......
......@@ -1779,14 +1779,6 @@ if they are not logged in. We point that to Astakos.
The ``UI_LOGOUT_URL`` option tells the Cyclades Web UI where to redirect the
user when he/she logs out. We point that to Astakos, too.
Edit ``/etc/synnefo/20-snf-cyclades-app-quotas.conf``:
.. code-block:: console
CYCLADES_USE_QUOTAHOLDER = True
CYCLADES_QUOTAHOLDER_URL = 'https://node1.example.com/quotaholder/v'
CYCLADES_QUOTAHOLDER_TOKEN = 'aExampleTokenJbFm12w'
Edit ``/etc/synnefo/20-snf-cyclades-app-vmapi.conf``:
.. code-block:: console
......
......@@ -107,10 +107,6 @@ In `/etc/synnefo/cyclades.conf` add:
CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
VMAPI_BASE_URL = 'https://cyclades.example.com/'
CYCLADES_QUOTAHOLDER_TOKEN = '1234'
CYCLADES_QUOTAHOLDER_URL = 'https://qh.example.com/quotaholder/v'
CYCLADES_USE_QUOTAHOLDER = True
CYCLADES_ASTAKOS_SERVICE_TOKEN = "XXXXXXXXXX"
UI_SYSTEM_IMAGES_OWNERS = {
......
# # -*- coding: utf-8 -*-
# #
# # QUOTAHOLDER configuration
# #####################
#
# # URL of the Quotaholder
# #
# #
# # Set to True to use the Quotaholder service. Otherwise, static
# # limits are used
# CYCLADES_USE_QUOTAHOLDER = False
#
# CYCLADES_QUOTAHOLDER_URL = "https://accounts.example.synnefo.org/quotaholder/v"
#
# # CYCLADES_QUOTAHOLDER_TOKEN = ""
# # Tune the size of the http pool for the quotaholder client.
# # It limits the maximum number of quota-querying requests
# # that Cyclades can serve. Extra requests will be blocked
# # until another has completed.
# CYCLADES_QUOTAHOLDER_POOLSIZE = 200
# -*- coding: utf-8 -*-
#
# QUOTAHOLDER configuration
#####################
# URL of the Quotaholder
#
#
# Set to True to use the Quotaholder service. Otherwise, static
# limits are used
CYCLADES_USE_QUOTAHOLDER = False
CYCLADES_QUOTAHOLDER_URL = "http://127.0.0.1:8008/api/quotaholder/v"
CYCLADES_QUOTAHOLDER_TOKEN = ""
# Tune the size of the http pool for the quotaholder client.
# It limits the maximum number of quota-querying requests
# that Cyclades can serve. Extra requests will be blocked
# until another has completed.
CYCLADES_QUOTAHOLDER_POOLSIZE = 200
......@@ -76,10 +76,10 @@ POOL_SIZE = 8
_pithos_backend_pool = \
PithosBackendPool(
POOL_SIZE,
quotaholder_enabled=settings.CYCLADES_USE_QUOTAHOLDER,
quotaholder_url=settings.CYCLADES_QUOTAHOLDER_URL,
quotaholder_token=settings.CYCLADES_QUOTAHOLDER_TOKEN,
quotaholder_client_poolsize=settings.CYCLADES_QUOTAHOLDER_POOLSIZE,
quotaholder_enabled=True,
quotaholder_url=settings.ASTAKOS_URL,
quotaholder_token=settings.CYCLADES_ASTAKOS_SERVICE_TOKEN,
quotaholder_client_poolsize=200,
db_connection=settings.BACKEND_DB_CONNECTION,
block_path=settings.BACKEND_BLOCK_PATH)
......
......@@ -32,7 +32,6 @@ from django.utils import simplejson as json
from snf_django.lib.api import faults
from synnefo.db.models import QuotaHolderSerial
from synnefo.settings import CYCLADES_USE_QUOTAHOLDER
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
ASTAKOS_URL)
......
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