openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins
2015-06-19 05:11:34 +00:00
committed by Gerrit Code Review
parent 128d113418 ce2d75df01
commit 6704027c6e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
exercises/sahara.sh
View File

@@ -35,7 +35,13 @@ source $TOP_DIR/exerciserc
is_service_enabled sahara || exit 55
$CURL_GET http://$SERVICE_HOST:8386/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Sahara API isn't functioning!"
if is_ssl_enabled_service "sahara" || is_service_enabled tls-proxy; then
SAHARA_SERVICE_PROTOCOL="https"
fi
SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
$CURL_GET $SAHARA_SERVICE_PROTOCOL://$SERVICE_HOST:8386/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Sahara API isn't functioning!"
set +o xtrace
echo "*********************************************************************"