GitList

Browse code

Insecure check if keystone is up

If we start keystone with an SSL endpoint then the curl check to see if
it is running will fail because it cannot create a secure connection.
This check can be done insecurely as all we care about is that the
service has started.

Change-Id: I826753d4d46e9956f443110029346bc70282951a

Jamie Lennox authored on 2014/02/26 12:46:56
Showing 1 changed files

lib/keystone

History View file @ 06ba519

@@ -424,7 +424,7 @@ function start_keystone() {
                          fi
                          echo "Waiting for keystone to start..."
                     -    if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -s $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$service_port/v$IDENTITY_API_VERSION/ >/dev/null; do sleep 1; done"; then
                     +    if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -k -s $KEYSTONE_AUTH_PROTOCOL://$SERVICE_HOST:$service_port/v$IDENTITY_API_VERSION/ >/dev/null; do sleep 1; done"; then
                              die $LINENO "keystone did not start"
                          fi