Browse code

Merge "Remove hardcoded http in URL in sahara exercise script"

Jenkins authored on 2015/06/19 14:11:34
Showing 1 changed files
... ...
@@ -35,7 +35,13 @@ source $TOP_DIR/exerciserc
35 35
 
36 36
 is_service_enabled sahara || exit 55
37 37
 
38
-$CURL_GET http://$SERVICE_HOST:8386/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Sahara API isn't functioning!"
38
+if is_ssl_enabled_service "sahara" || is_service_enabled tls-proxy; then
39
+    SAHARA_SERVICE_PROTOCOL="https"
40
+fi
41
+
42
+SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
43
+
44
+$CURL_GET $SAHARA_SERVICE_PROTOCOL://$SERVICE_HOST:8386/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Sahara API isn't functioning!"
39 45
 
40 46
 set +o xtrace
41 47
 echo "*********************************************************************"