openstack
/
devstack
Code Issues Proposed changes

cinder: wait for cinder-api for wsgi too 

Wait for cinder-api's status if CINDER_USE_MOD_WSGI=True

Change-Id: I40e5e08633572f877a25280496141423f232d447
This commit is contained in:
Eli Qiao 2017-02-28 15:13:02 +08:00
parent 1e7f738f28
commit 4af6eeac52
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cinder
View File

@ -528,10 +528,11 @@ function start_cinder {
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"