commit 20435d7de4b2157c241660f4aee821970c8b57a7
author Jenkins <jenkins@review.openstack.org> Fri Jul 20 18:16:04 2012 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jul 20 18:16:04 2012 +0000
tree de24c6e47fe23b7447c57779fec6de0cd4b18ef0
parent f4d5780d644d7107c5e47969b02d5085f67aab95
parent 91b0acdefff432edf0021b00fe535637ecb8d789

Merge "Allow wget to handle Non-English output"

stack.sh

diff --git a/stack.sh b/stack.sh
index 93d20d4..75923a3 100755
--- a/stack.sh
+++ b/stack.sh
@@ -2007,7 +2007,7 @@
     # launch keystone and wait for it to answer before continuing
     screen_it key "cd $KEYSTONE_DIR && $KEYSTONE_DIR/bin/keystone-all --config-file $KEYSTONE_CONF $KEYSTONE_LOG_CONFIG -d --debug"
     echo "Waiting for keystone to start..."
-    if ! timeout $SERVICE_TIMEOUT sh -c "while http_proxy= wget -O- $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/ 2>&1 | grep -q 'refused'; do sleep 1; done"; then
+    if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= curl -s $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/ >/dev/null; do sleep 1; done"; then
       echo "keystone did not start"
       exit 1
     fi