From dd016c75c9bc60bac32335b8e8bb057f23bcdb6a Mon Sep 17 00:00:00 2001 From: "Ryan S. Brown" Date: Wed, 10 Feb 2016 14:32:23 -0500 Subject: [PATCH] Use Client-ID in devstack ping request to Zaqar With the recently merged patch https://review.openstack.org/274972, Zaqar now requires "Client-ID" header for API v2. Our devstack plugin checks if Zaqar has started by sending request to Zaqar's ping endpoint. But devstack plugin is not using "Client-ID" header for sending this request, so the request now always fails and devstack thinks that Zaqar service hasn't started. This patch adds "Client-ID" header to the ping request to Zaqar in the devstack plugin. Change-Id: I441a5a9778d0676e0a380f5e20be40e1a029409f --- devstack/plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 98d07624c..ac5f78a62 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -207,7 +207,7 @@ function start_zaqar { 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=\"X-Auth-Token:$token\" -O- $ZAQAR_SERVICE_PROTOCOL://$ZAQAR_SERVICE_HOST:$ZAQAR_SERVICE_PORT/v2/ping; do sleep 1; done"; then + 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 }