cinder: wait for cinder-api for wsgi too
Wait for cinder-api's status if CINDER_USE_MOD_WSGI=True
Change-Id: I40e5e08633572f877a25280496141423f232d447
diff --git a/lib/cinder b/lib/cinder
index 767fd00..130345f 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -528,10 +528,11 @@
tail_log c-api /var/log/$APACHE_NAME/c-api.log
else
run_process c-api "$CINDER_BIN_DIR/cinder-api --config-file $CINDER_CONF"
- echo "Waiting for Cinder API to start..."
- if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$CINDER_SERVICE_HOST:$service_port; then
- die $LINENO "c-api did not start"
- fi
+ fi
+
+ echo "Waiting for Cinder API to start..."
+ if ! wait_for_service $SERVICE_TIMEOUT $service_protocol://$CINDER_SERVICE_HOST:$service_port; then
+ die $LINENO "c-api did not start"
fi
run_process c-sch "$CINDER_BIN_DIR/cinder-scheduler --config-file $CINDER_CONF"