From 30c72fa978df55482717ac10c23514a2a073ea0d Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Mon, 3 Jul 2017 14:37:57 +0000 Subject: [PATCH] Revert "Remove startup check from devstack" This reverts commit 4a1a6b3766b7cd63afff36307a8044cf3b848a31. It didn't improve the situation, and at least it's failing early. Conflicts: devstack/plugin.sh Change-Id: Idf16037e6a3bbc7f915e12827348eda663721d5e --- devstack/plugin.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 058bfa5bc..cd657c370 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -242,6 +242,12 @@ function start_zaqar { cat $ZAQAR_UWSGI_CONF run_process zaqar-wsgi "$ZAQAR_BIN_DIR/uwsgi --ini $ZAQAR_UWSGI_CONF --pidfile2 $ZAQAR_UWSGI_MASTER_PIDFILE" run_process zaqar-websocket "$ZAQAR_BIN_DIR/zaqar-server --config-file $ZAQAR_CONF" + + echo "Waiting for Zaqar to start..." + token=$(openstack token issue -c id -f value) + if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q --header=\"Client-ID:$(uuidgen)\" --header=\"X-Auth-Token:$token\" -O- $ZAQAR_SERVICE_PROTOCOL://$ZAQAR_SERVICE_HOST:$ZAQAR_SERVICE_PORT/v2/ping; do sleep 1; done"; then + die $LINENO "Zaqar did not start" + fi } # stop_zaqar() - Stop running processes