openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "TrivialFix: Make timeout a parameter in wait_for"

This commit is contained in:
Zuul 2018-02-22 11:05:12 +00:00 committed by Gerrit Code Review
parent da611aef0a ccca8dbfa0
commit c36a6ddc59
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/plugin.sh
View File

@ -413,18 +413,14 @@ function wait_for {
local url
local cacert_path
local flags
local timeout=$KURYR_WAIT_TIMEOUT
name="$1"
url="$2"
cacert_path=${3:-}
timeout=${4:-$KURYR_WAIT_TIMEOUT}
echo -n "Waiting for $name to respond"
if [ $# == 3 ]; then
extra_flags="--cacert ${cacert_path}"
else
extra_flags=""
fi
extra_flags=${cacert_path:+"--cacert ${cacert_path}"}
local start_time=$(date +%s)
until curl -o /dev/null -sf $extra_flags "$url"; do