Browse code

Merge "Insecure check if keystone is up"

Jenkins authored on 2014/02/27 12:31:02
Showing 1 changed files
... ...
@@ -424,7 +424,7 @@ function start_keystone() {
424 424
     fi
425 425
 
426 426
     echo "Waiting for keystone to start..."
427
-    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
427
+    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
428 428
         die $LINENO "keystone did not start"
429 429
     fi
430 430