Revision 7a0c725d snf-cyclades-app/synnefo/ui/settings.py
b/snf-cyclades-app/synnefo/ui/settings.py | ||
---|---|---|
36 | 36 |
from synnefo.cyclades_settings import cyclades_services, astakos_services |
37 | 37 |
|
38 | 38 |
from synnefo.lib import join_urls |
39 |
from synnefo.lib.services import get_public_endpoint |
|
39 |
from synnefo.lib.services import get_public_endpoint as endpoint
|
|
40 | 40 |
|
41 | 41 |
from django.conf import settings |
42 | 42 |
|
... | ... | |
44 | 44 |
if not BASE_PATH.startswith("/"): |
45 | 45 |
BASE_PATH = "/" + BASE_PATH |
46 | 46 |
|
47 |
GLANCE_URL = get_public_endpoint(cyclades_services, 'image', 'v1.0') |
|
48 |
COMPUTE_URL = get_public_endpoint(cyclades_services, 'compute', 'v2.0') |
|
49 |
USERDATA_URL = get_public_endpoint(cyclades_services, 'cyclades_userdata', '') |
|
50 |
ASTAKOS_UI_URL = get_public_endpoint(astakos_services, 'astakos_ui', '') |
|
47 |
GLANCE_URL = endpoint(cyclades_services, 'image', 'v1.0').rstrip('/') |
|
48 |
COMPUTE_URL = endpoint(cyclades_services, 'compute', 'v2.0').rstrip('/') |
|
49 |
USERDATA_URL = endpoint(cyclades_services, 'cyclades_userdata', '').rstrip('/') |
|
50 |
ASTAKOS_UI_URL = endpoint(astakos_services, 'astakos_ui', '').rstrip('/') |
|
51 |
|
|
51 | 52 |
|
52 | 53 |
if cyclades.PROXY_USER_SERVICES: |
53 | 54 |
ACCOUNT_URL = join_urls('/', cyclades.BASE_ASTAKOS_PROXY_PATH, |
Also available in: Unified diff