Revision e407f159 snf-cyclades-app/synnefo/ui/settings.py
| b/snf-cyclades-app/synnefo/ui/settings.py | ||
|---|---|---|
| 33 | 33 |
# |
| 34 | 34 |
|
| 35 | 35 |
import synnefo.cyclades_settings as cyclades |
| 36 |
from synnefo.cyclades_settings import cyclades_services, astakos_services
|
|
| 36 |
from synnefo.cyclades_settings import cyclades_services |
|
| 37 | 37 |
|
| 38 | 38 |
from synnefo.lib import join_urls |
| 39 | 39 |
from synnefo.lib.services import get_public_endpoint as endpoint |
| 40 | 40 |
|
| 41 |
from django.conf import settings |
|
| 42 | 41 |
|
| 43 | 42 |
BASE_PATH = cyclades.BASE_PATH |
| 44 | 43 |
if not BASE_PATH.startswith("/"):
|
| ... | ... | |
| 47 | 46 |
GLANCE_URL = endpoint(cyclades_services, 'image', 'v1.0').rstrip('/')
|
| 48 | 47 |
COMPUTE_URL = endpoint(cyclades_services, 'compute', 'v2.0').rstrip('/')
|
| 49 | 48 |
USERDATA_URL = endpoint(cyclades_services, 'cyclades_userdata', '').rstrip('/')
|
| 50 |
ASTAKOS_UI_URL = endpoint(astakos_services, 'astakos_ui', '').rstrip('/')
|
|
| 51 |
|
|
| 52 |
|
|
| 53 |
if cyclades.PROXY_USER_SERVICES: |
|
| 54 |
ACCOUNT_URL = join_urls('/', cyclades.BASE_ASTAKOS_PROXY_PATH,
|
|
| 55 |
cyclades.ASTAKOS_ACCOUNTS_PREFIX, 'v1.0') |
|
| 56 |
else: |
|
| 57 |
ACCOUNT_URL = endpoint(astakos_services, 'account', 'v1.0') |
|
| 58 | 49 |
|
| 50 |
ACCOUNT_URL = join_urls('/', cyclades.ASTAKOS_ACCOUNT_PROXY_PATH)
|
|
| 59 | 51 |
|
| 60 | 52 |
USER_CATALOG_URL = join_urls(ACCOUNT_URL, 'user_catalogs') |
| 61 | 53 |
FEEDBACK_URL = join_urls(ACCOUNT_URL, 'feedback') |
| 62 | 54 |
|
| 63 |
LOGIN_URL = join_urls(ASTAKOS_UI_URL, 'login')
|
|
| 55 |
LOGIN_URL = join_urls('/', cyclades.ASTAKOS_UI_PROXY_PATH, 'login')
|
|
| 64 | 56 |
LOGOUT_REDIRECT = LOGIN_URL |
Also available in: Unified diff