Revision 00d2a0ee snf-cyclades-app/synnefo/cyclades_settings.py

b/snf-cyclades-app/synnefo/cyclades_settings.py
35 35
from synnefo.lib import join_urls, parse_base_url
36 36
from synnefo.util.keypath import get_path
37 37
from synnefo.api.services import cyclades_services as vanilla_cyclades_services
38
from astakosclient import astakos_services as vanilla_astakos_services
38
from astakosclient import astakos_services
39 39

  
40 40
from copy import deepcopy
41 41

  
42

  
43
# Process Cyclades settings
44

  
42 45
BASE_URL = getattr(settings, 'CYCLADES_BASE_URL',
43 46
                   'https://compute.example.synnefo.org/compute/')
44 47
BASE_HOST, BASE_PATH = parse_base_url(BASE_URL)
45 48

  
46
ASTAKOS_BASE_URL = getattr(settings, 'ASTAKOS_BASE_URL',
47
                           'https://accounts.example.synnefo.org/astakos/')
48
ASTAKOS_BASE_HOST, ASTAKOS_BASE_PATH = parse_base_url(ASTAKOS_BASE_URL)
49

  
50 49
CUSTOMIZE_SERVICES = getattr(settings, 'CYCLADES_CUSTOMIZE_SERVICES', ())
51 50
cyclades_services = deepcopy(vanilla_cyclades_services)
52 51
for path, value in CUSTOMIZE_SERVICES:
53 52
    set_path(cyclades_services, path, value, createpath=True)
54 53

  
55
astakos_services = deepcopy(vanilla_astakos_services)
56
CUSTOMIZE_ASTAKOS_SERVICES = \
57
        getattr(settings, 'CYCLADES_CUSTOMIZE_ASTAKOS_SERVICES', ())
58
for path, value in CUSTOMIZE_ASTAKOS_SERVICES:
59
    set_path(astakos_services, path, value, createpath=True)
60

  
61 54
COMPUTE_PREFIX = get_path(cyclades_services, 'cyclades_compute.prefix')
62 55
VMAPI_PREFIX = get_path(cyclades_services, 'cyclades_vmapi.prefix')
63 56
PLANKTON_PREFIX = get_path(cyclades_services, 'cyclades_plankton.prefix')
......
65 58
UI_PREFIX = get_path(cyclades_services, 'cyclades_ui.prefix')
66 59
USERDATA_PREFIX = get_path(cyclades_services, 'cyclades_userdata.prefix')
67 60

  
61
COMPUTE_ROOT_URL = join_urls(BASE_URL, COMPUTE_PREFIX)
62

  
63

  
64
# Process Astakos settings
65

  
66
ASTAKOS_BASE_URL = getattr(settings, 'ASTAKOS_BASE_URL',
67
                           'https://accounts.example.synnefo.org/astakos/')
68
ASTAKOS_BASE_HOST, ASTAKOS_BASE_PATH = parse_base_url(ASTAKOS_BASE_URL)
69

  
70
# Patch astakosclient directly, otherwise it will not see any customization
71
#astakos_services = deepcopy(vanilla_astakos_services)
72
CUSTOMIZE_ASTAKOS_SERVICES = \
73
        getattr(settings, 'CYCLADES_CUSTOMIZE_ASTAKOS_SERVICES', ())
74
for path, value in CUSTOMIZE_ASTAKOS_SERVICES:
75
    set_path(astakos_services, path, value, createpath=True)
76

  
68 77
ASTAKOS_ACCOUNTS_PREFIX = get_path(astakos_services, 'astakos_account.prefix')
69 78
ASTAKOS_VIEWS_PREFIX = get_path(astakos_services, 'astakos_ui.prefix')
70 79
ASTAKOS_KEYSTONE_PREFIX = get_path(astakos_services, 'astakos_keystone.prefix')
71 80

  
72
# The API implementation needs to accept and return absolute references
73
# to its resources. Thus, it needs to know its public URL.
74
COMPUTE_ROOT_URL = join_urls(BASE_URL, COMPUTE_PREFIX)
81

  
82
# Proxy Astakos settings
75 83

  
76 84
BASE_ASTAKOS_PROXY_PATH = getattr(settings,
77 85
                                  'CYCLADES_BASE_ASTAKOS_PROXY_PATH',

Also available in: Unified diff