openstack/zaqar
Code Issues Proposed changes

Use Client-ID in devstack ping request to Zaqar

Browse Source 
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
This commit is contained in:
Ryan S. Brown 2016-02-10 14:32:23 -05:00 committed by Ryan Brown
parent 1db24472df
commit dd016c75c9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -207,7 +207,7 @@ function start_zaqar {
echo "Waiting for Zaqar to start..." echo "Waiting for Zaqar to start..."
token=$(openstack token issue -c id -f value) 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" die $LINENO "Zaqar did not start"
fi fi
} }