From: Yasin Rahman Date: Tue, 12 May 2015 13:10:33 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.4~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d1b79fec3d01b9286b977b26efdca49bdb21566c;hp=ca0fa822b04a0e28f0e85f29e476cc7b6ecd70a6;p=unfold.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/myslice/settings.py b/myslice/settings.py index b36281b1..0e0bf371 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -365,7 +365,7 @@ CSRF_FAILURE_VIEW = 'manifoldapi.manifoldproxy.csrf_failure' ####SLA##### -SLA_COLLECTOR_URL = "http://157.193.215.125:4001/sla-collector/sla" +SLA_COLLECTOR_URL = "https://157.193.215.125:4001/sla-collector/sla" SLA_COLLECTOR_USER = "portal" SLA_COLLECTOR_PASSWORD = "password" diff --git a/portal/servicedirectory.py b/portal/servicedirectory.py index ad4967d7..eab0cd0d 100644 --- a/portal/servicedirectory.py +++ b/portal/servicedirectory.py @@ -18,7 +18,7 @@ import json class ServiceDirectoryView (LoginRequiredAutoLogoutView, ThemeView): template_name = 'servicedirectory.html' - server_url = "http://157.193.215.125:4001/service-directory/" + server_url = "https://157.193.215.125:4001/service-directory/" # expose this so we can mention the backend URL on the welcome page def default_env (self): diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index a3445548..c3dc0134 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -126,7 +126,7 @@ class Client(object): # for key, values in kwargs.iteritems(): # print key, values - result = requests.get(url, **kwargs) + result = requests.get(url, verify=False, **kwargs) logger.debug('SLA GET {} - result: {}'.format(result.url, result.status_code)) # print "GET {} {} {}".format( # result.url, result.status_code, result.text[0:70])