Fix ALB/ELB wait timeouts

Author: dmitrygusev

load-balancing/elb-v2/common_functions.sh

@@ -321,7 +321,7 @@ reset_waiter_timeout() {
         msg "Calculating timeout for register instance in target group $target_group_name"
         local health_check_interval=$(echo $target_group_info | awk '{print $1}')
         local health_check_timeout=$(echo $target_group_info | awk '{print $2}')
-        local health_check_threshold=$(echo $target_group_info | awk '{print $2}')
+        local health_check_threshold=$(echo $target_group_info | awk '{print $3}')
         local timeout=$(echo "$health_check_threshold * ( $health_check_timeout + $health_check_interval )" | /usr/bin/bc)
     elif [ "$state_name" == "unused" ]; then
         msg "Getting target group arn for target group $target_group_name"

load-balancing/elb/common_functions.sh

@@ -445,9 +445,15 @@ reset_waiter_timeout() {
     if [ "$state_name" == "InService" ]; then
 
         # Wait for a health check to succeed
-        local timeout=$($AWS_CLI elb describe-load-balancers \
+        local elb_info=$($AWS_CLI elb describe-load-balancers \
             --load-balancer-name $elb \
-            --query \'LoadBalancerDescriptions[0].HealthCheck.Timeout\')
+            --query \'LoadBalancerDescriptions[0].HealthCheck.[HealthyThreshold,Interval,Timeout]\' \
+            --output text)
+
+        local health_check_threshold=$(echo $elb_info | awk '{print $1}')
+        local health_check_interval=$(echo $elb_info | awk '{print $2}')
+        local health_check_timeout=$(echo $elb_info | awk '{print $3}')
+        local timeout=$((health_check_threshold * (health_check_interval + health_check_timeout)))
 
     elif [ "$state_name" == "OutOfService" ]; then