fix docker run script
Change-Id: I59dbb29af17dc108e9593b6a28205ed7bd74016d
Issue-ID: SDC-920
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index 4ccf561..f0594b6 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -25,7 +25,7 @@
else
echo "performing $1 docker cleanup"
tmp=`docker ps -a -q --filter="name=$1"`
- if [[ ! -z "$tmp" ]]; then
+ if [[ ! -z "$tmp" ]]; then
docker rm -f ${tmp}
fi
fi
@@ -85,7 +85,7 @@
function probe_es {
es_stat=false
-health_Check_http_code=$(curl -o /dev/null -w '%{http_code}' http://${IP}:9200/_cluster/health?wait_for_status=yellow&timeout=120s)
+health_Check_http_code=$(curl --noproxy "*" -o /dev/null -w '%{http_code}' http://${IP}:9200/_cluster/health?wait_for_status=yellow&timeout=120s)
if [[ "$health_Check_http_code" -eq 200 ]]
then
echo DOCKER start finished in $2 seconds
@@ -143,20 +143,20 @@
}
function healthCheck {
- curl ${IP}:9200/_cluster/health?pretty=true
+ curl --noproxy "*" ${IP}:9200/_cluster/health?pretty=true
echo "BE health-Check:"
- curl http://${IP}:8080/sdc2/rest/healthCheck
+ curl --noproxy "*" http://${IP}:8080/sdc2/rest/healthCheck
echo ""
echo ""
echo "FE health-Check:"
- curl http://${IP}:8181/sdc1/rest/healthCheck
+ curl --noproxy "*" http://${IP}:8181/sdc1/rest/healthCheck
echo ""
echo ""
- healthCheck_http_code=$(curl -o /dev/null -w '%{http_code}' -H "Accept: application/json" -H "Content-Type: application/json" -H "USER_ID: jh0003" http://${IP}:8080/sdc2/rest/v1/user/demo;)
+ healthCheck_http_code=$(curl --noproxy "*" -o /dev/null -w '%{http_code}' -H "Accept: application/json" -H "Content-Type: application/json" -H "USER_ID: jh0003" http://${IP}:8080/sdc2/rest/v1/user/demo;)
if [[ ${healthCheck_http_code} != 200 ]]
then
echo "Error [${healthCheck_http_code}] while user existance check"