Revision cbc4c781
b/snf-cyclades-app/synnefo/vmapi/models.py | ||
---|---|---|
41 | 41 |
from synnefo.api.servers import server_created |
42 | 42 |
from synnefo.vmapi import backend, get_key, get_uuid, settings |
43 | 43 |
|
44 |
from urlparse import urljoin |
|
45 |
|
|
46 | 44 |
log = getLogger('synnefo.vmapi') |
47 | 45 |
|
48 | 46 |
|
... | ... | |
54 | 52 |
backend.set(key, json_value) |
55 | 53 |
|
56 | 54 |
path = reverse("vmapi_server_params", args=[uuid]).lstrip('/') |
57 |
config_url = urljoin(settings.BASE_URL, path)
|
|
55 |
config_url = join_urls(settings.BASE_HOST, path)
|
|
58 | 56 |
# inject sender (vm) with its configuration url |
59 | 57 |
setattr(sender, 'config_url', config_url) |
60 | 58 |
return uuid |
b/snf-cyclades-app/synnefo/vmapi/settings.py | ||
---|---|---|
32 | 32 |
# or implied, of GRNET S.A. |
33 | 33 |
|
34 | 34 |
from django.conf import settings |
35 |
from synnefo.cyclades_settings import BASE_URL, BASE_HOST, BASE_PATH |
|
35 | 36 |
|
36 | 37 |
CACHE_BACKEND = getattr(settings, 'VMAPI_CACHE_BACKEND', |
37 | 38 |
settings.CACHE_BACKEND) |
38 | 39 |
CACHE_KEY_PREFIX = getattr(settings, 'VMAPI_CACHE_KEY_PREFIX', |
39 | 40 |
'vmapi') |
40 | 41 |
RESET_PARAMS = getattr(settings, 'VMAPI_RESET_PARAMS', True) |
41 |
BASE_URL = getattr(settings, 'VMAPI_BASE_URL', |
|
42 |
'https://cyclades.okeanos.grnet.gr/') |
Also available in: Unified diff