From 520a9ca5565d145d4e970595419cb00b19735030 Mon Sep 17 00:00:00 2001 From: Hua ZHANG Date: Thu, 3 May 2012 18:17:18 +0800 Subject: [PATCH] Allow wget to handle Non-English output The stack.sh has a loop to wait for keystone to start. But the output of wget tool has been globalized which means it won't return the English word 'refused' on Non-English environment even the keystone is not up. So the script will assume the keystone has been started and continue. The command of keystone tenant-create always failed immediately after skipping this loop since it require keystone to be started to authenticate. That's why you can see authentication error in the log because the tenant information was not correctly set up. Fix bug 978739 Change-Id: Ia4ebe6ad0f9b5a886de48a4bea7c2aebff420dad --- AUTHORS | 1 + stack.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 820a677385..bca25b43e7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,6 +11,7 @@ Eddie Hebert Eoghan Glynn Gabriel Hurley Hengqing Hu +Hua ZHANG Jake Dahn James E. Blair Jason Cannavale diff --git a/stack.sh b/stack.sh index a7891afe54..e66f71d163 100755 --- a/stack.sh +++ b/stack.sh @@ -1723,7 +1723,7 @@ if is_service_enabled key; then # 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= wget -O- $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$KEYSTONE_API_PORT/v2.0/ 2>&1 | grep -q '200 OK'; do sleep 1; done"; then echo "keystone did not start" exit 1 fi