From c1e340fbd6e7bbfce6cca72a9e8b47d4980e5633 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Tue, 9 Aug 2016 14:56:19 -0400 Subject: [PATCH 1/3] allow for 201 status_code from callback --- tools/scripts/request_tower_configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/request_tower_configuration.sh b/tools/scripts/request_tower_configuration.sh index 0e569ac5fd..86c90ac805 100644 --- a/tools/scripts/request_tower_configuration.sh +++ b/tools/scripts/request_tower_configuration.sh @@ -14,7 +14,7 @@ attempt=0 while [[ $attempt -lt $retry_attempts ]] do status_code=`curl -s -i --data "host_config_key=$2" http://$1/api/v1/job_templates/$3/callback/ | head -n 1 | awk '{print $2}'` - if [[ $status_code == 202 ]] + if [[ $status_code == 202 || $status_code == 201 ]] then exit 0 fi From efb66cad20dd4afe396b46075008c161ba46a7cf Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 12 Aug 2016 07:31:01 -0400 Subject: [PATCH 2/3] bail when status code is over 300 --- tools/scripts/request_tower_configuration.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/scripts/request_tower_configuration.sh b/tools/scripts/request_tower_configuration.sh index 86c90ac805..eb7431c6b4 100644 --- a/tools/scripts/request_tower_configuration.sh +++ b/tools/scripts/request_tower_configuration.sh @@ -14,7 +14,11 @@ attempt=0 while [[ $attempt -lt $retry_attempts ]] do status_code=`curl -s -i --data "host_config_key=$2" http://$1/api/v1/job_templates/$3/callback/ | head -n 1 | awk '{print $2}'` - if [[ $status_code == 202 || $status_code == 201 ]] + if [[ $status_code -ge 300 ]] + then + echo "${status_code} received, encountered problem, halting." + exit 1 + elif [[ $status_code -gt 200 ]] then exit 0 fi From ba101573d6e366f3530b35e5a4e8744b7e7345d9 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 12 Aug 2016 11:15:15 -0400 Subject: [PATCH 3/3] interpret any code below 300 as success --- tools/scripts/request_tower_configuration.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/scripts/request_tower_configuration.sh b/tools/scripts/request_tower_configuration.sh index eb7431c6b4..4b3b731772 100644 --- a/tools/scripts/request_tower_configuration.sh +++ b/tools/scripts/request_tower_configuration.sh @@ -18,8 +18,7 @@ do then echo "${status_code} received, encountered problem, halting." exit 1 - elif [[ $status_code -gt 200 ]] - then + else exit 0 fi attempt=$(( attempt + 1 ))