Merge "Change config-file to config-dir for g-api start"

This commit is contained in:
Zuul 2019-02-14 11:23:25 +00:00 committed by Gerrit Code Review
commit 59206372ee

View File

@ -345,7 +345,7 @@ function start_glance {
if [[ "$WSGI_MODE" == "uwsgi" ]]; then if [[ "$WSGI_MODE" == "uwsgi" ]]; then
run_process g-api "$GLANCE_BIN_DIR/uwsgi --procname-prefix glance-api --ini $GLANCE_UWSGI_CONF" run_process g-api "$GLANCE_BIN_DIR/uwsgi --procname-prefix glance-api --ini $GLANCE_UWSGI_CONF"
else else
run_process g-api "$GLANCE_BIN_DIR/glance-api --config-file=$GLANCE_CONF_DIR/glance-api.conf" run_process g-api "$GLANCE_BIN_DIR/glance-api --config-dir=$GLANCE_CONF_DIR"
fi fi
echo "Waiting for g-api ($GLANCE_SERVICE_HOST) to start..." echo "Waiting for g-api ($GLANCE_SERVICE_HOST) to start..."