@@ -446,7 +446,10 @@ function start_keystone {

     fi

     echo "Waiting for keystone to start..."

-    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

+    # Check that the keystone service is running. Even if the tls tunnel

+    # should be enabled, make sure the internal port is checked using

+    # unencryted traffic at this point.

+    if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -k -s http://$KEYSTONE_SERVICE_HOST:$service_port/v$IDENTITY_API_VERSION/ >/dev/null; do sleep 1; done"; then

         die $LINENO "keystone did not start"

     fi