Revision 18c4414d

b/docs/scale/i-cyclades.rst
98 98
    CACHE_BACKEND = 'memcached://127.0.0.1:11211/'
99 99
    VMAPI_BASE_URL = 'https://cyclades.example.com/'
100 100

  
101
    CYCLADES_ASTAKOS_SERVICE_TOKEN = "XXXXXXXXXX"
101
    CYCLADES_SERVICE_TOKEN = "XXXXXXXXXX"
102 102

  
103 103
    UI_SYSTEM_IMAGES_OWNERS = {
104 104
        'admin@synnefo.gr': 'system',
b/docs/upgrade/upgrade-0.14.rst
61 61
* In Cyclades settings, rename the ``APP_INSTALL_URL`` setting
62 62
  to ``CYCLADES_BASE_URL``. If no such setting has been configured,
63 63
  you must set it. It must point to the top-level Cyclades URL.
64
  Rename ``CYCLADES_ASTAKOS_SERVICE_TOKEN`` to ``CYCLADES_SERVICE_TOKEN``.
64 65

  
65 66
* In Pithos settings, introduce a ``PITHOS_BASE_URL`` setting.
66 67
  It must point to the top-level Pithos URL.
b/snf-cyclades-app/conf/20-snf-cyclades-app-api.conf
108 108
## Astakos service token
109 109
## The token used for astakos service api calls (e.g. api to retrieve user email
110 110
## using a user uuid)
111
#CYCLADES_ASTAKOS_SERVICE_TOKEN = ''
111
#CYCLADES_SERVICE_TOKEN = ''
112 112

  
113 113
# Let cyclades proxy user specific api calls to astakos, via self served
114 114
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the
b/snf-cyclades-app/synnefo/api/management/commands/cyclades-astakos-migrate-013.py
52 52
    print "WARNING: %s" % ' '.join(msgs)
53 53

  
54 54
get_displayname = functools.partial(astakos.get_displayname,
55
                                 settings.CYCLADES_ASTAKOS_SERVICE_TOKEN,
55
                                 settings.CYCLADES_SERVICE_TOKEN,
56 56
                                 url=settings.ASTAKOS_URL.replace('im/authenticate',
57 57
                                                                 'service/api/user_catalogs'))
58 58
get_user_uuid = functools.partial(astakos.get_user_uuid,
59
                                 settings.CYCLADES_ASTAKOS_SERVICE_TOKEN,
59
                                 settings.CYCLADES_SERVICE_TOKEN,
60 60
                                 url=settings.ASTAKOS_URL.replace('im/authenticate',
61 61
                                                                 'service/api/user_catalogs'))
62 62

  
b/snf-cyclades-app/synnefo/api/management/commands/network-list.py
35 35

  
36 36
from synnefo.webproject.management.commands import ListCommand
37 37
from synnefo.db.models import Network
38
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
38
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
39 39
                              ASTAKOS_BASE_URL)
40 40

  
41 41
from logging import getLogger
b/snf-cyclades-app/synnefo/api/management/commands/server-inspect.py
40 40
from synnefo.logic.rapi import GanetiApiError
41 41
from synnefo.management.common import Omit
42 42
from synnefo.management import common
43
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
43
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
44 44
                              ASTAKOS_BASE_URL)
45 45

  
46 46

  
b/snf-cyclades-app/synnefo/api/management/commands/server-list.py
37 37
from synnefo.db.models import VirtualMachine
38 38
from synnefo.management.common import get_backend
39 39
from synnefo.api.util import get_image
40
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
40
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
41 41
                              ASTAKOS_BASE_URL)
42 42
from logging import getLogger
43 43
log = getLogger(__name__)
b/snf-cyclades-app/synnefo/api/management/commands/server-show.py
36 36
from synnefo.management.common import (format_vm_state, get_vm,
37 37
                                       get_image)
38 38
from snf_django.lib.astakos import UserCache
39
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
39
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
40 40
                              ASTAKOS_BASE_URL)
41 41
from synnefo.webproject.management import utils
42 42

  
b/snf-cyclades-app/synnefo/app_settings/default/api.py
108 108
# Astakos service token
109 109
# The token used for astakos service api calls (e.g. api to retrieve user email
110 110
# using a user uuid)
111
CYCLADES_ASTAKOS_SERVICE_TOKEN = '' 
111
CYCLADES_SERVICE_TOKEN = '' 
112 112

  
113 113
# Let cyclades proxy user specific api calls to astakos, via self served
114 114
# endpoints. Set this to False if you deploy cyclades-app/astakos-app on the
b/snf-cyclades-app/synnefo/logic/management/commands/network-inspect.py
42 42
                               pooled_rapi_client)
43 43
from synnefo.logic.rapi import GanetiApiError
44 44
from snf_django.lib.astakos import UserCache
45
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
45
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
46 46
                              ASTAKOS_BASE_URL)
47 47
from util import pool_map_chunks
48 48

  
b/snf-cyclades-app/synnefo/plankton/backend.py
77 77
    PithosBackendPool(
78 78
        POOL_SIZE,
79 79
        astakos_url=settings.ASTAKOS_BASE_URL,
80
        service_token=settings.CYCLADES_ASTAKOS_SERVICE_TOKEN,
80
        service_token=settings.CYCLADES_SERVICE_TOKEN,
81 81
        astakosclient_poolsize=settings.ASTAKOS_POOLSIZE,
82 82
        db_connection=settings.BACKEND_DB_CONNECTION,
83 83
        block_path=settings.BACKEND_BLOCK_PATH)
b/snf-cyclades-app/synnefo/quotas/__init__.py
33 33
from snf_django.lib.api import faults
34 34
from synnefo.db.models import QuotaHolderSerial, VirtualMachine, Network
35 35

  
36
from synnefo.settings import (CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN,
36
from synnefo.settings import (CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN,
37 37
                              ASTAKOS_BASE_URL)
38 38
from astakosclient import AstakosClient
39 39
from astakosclient.errors import AstakosClientException, QuotaLimit
b/snf-cyclades-app/synnefo/quotas/management/commands/reconcile-resources-cyclades.py
39 39
from synnefo.quotas.util import (get_db_holdings, get_quotaholder_holdings,
40 40
                                 transform_quotas)
41 41
from synnefo.webproject.management.utils import pprint_table
42
from synnefo.settings import CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN
42
from synnefo.settings import CYCLADES_SERVICE_TOKEN as ASTAKOS_TOKEN
43 43

  
44 44

  
45 45
class Command(BaseCommand):

Also available in: Unified diff