Commit 512f8b2e authored by Georgios D. Tsoukalas's avatar Georgios D. Tsoukalas
Browse files

cyclades: fix URLs in vmapi

parent 41668904
......@@ -41,8 +41,6 @@ from synnefo.lib import join_urls
from synnefo.api.servers import server_created
from synnefo.vmapi import backend, get_key, get_uuid, settings
from urlparse import urljoin
log = getLogger('synnefo.vmapi')
......@@ -54,7 +52,7 @@ def create_server_params(sender, created_vm_params, **kwargs):
backend.set(key, json_value)
path = reverse("vmapi_server_params", args=[uuid]).lstrip('/')
config_url = urljoin(settings.BASE_URL, path)
config_url = join_urls(settings.BASE_HOST, path)
# inject sender (vm) with its configuration url
setattr(sender, 'config_url', config_url)
return uuid
......
......@@ -32,11 +32,10 @@
# or implied, of GRNET S.A.
from django.conf import settings
from synnefo.cyclades_settings import BASE_URL, BASE_HOST, BASE_PATH
CACHE_BACKEND = getattr(settings, 'VMAPI_CACHE_BACKEND',
settings.CACHE_BACKEND)
CACHE_KEY_PREFIX = getattr(settings, 'VMAPI_CACHE_KEY_PREFIX',
'vmapi')
RESET_PARAMS = getattr(settings, 'VMAPI_RESET_PARAMS', True)
BASE_URL = getattr(settings, 'VMAPI_BASE_URL',
'https://cyclades.okeanos.grnet.gr/')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment