Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/myslice/settings.py b/myslice/settings.py
index b36281b..0e0bf37 100644 (file)
--- 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 ad4967d..eab0cd0 100644 (file)
--- 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 a344554..c3dc013 100755 (executable)
--- 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])