commit 59206372eedd5c4f204e37b5168d277bbe615403
author Zuul <zuul@review.openstack.org> Thu Feb 14 11:23:25 2019 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 14 11:23:25 2019 +0000
tree f01500442a54fbfc56c349f93c7128e62f105801
parent 2a9900d8f21ec4d5a77893cab931c4fb03851c52
parent 96269d8e758e168fb857fca6e96cbd9a50628ac0

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

lib/glance

diff --git a/lib/glance b/lib/glance
index 8001157..65487cb 100644
--- a/lib/glance
+++ b/lib/glance
@@ -345,7 +345,7 @@
     if [[ "$WSGI_MODE" == "uwsgi" ]]; then
         run_process g-api "$GLANCE_BIN_DIR/uwsgi --procname-prefix glance-api --ini $GLANCE_UWSGI_CONF"
     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
 
     echo "Waiting for g-api ($GLANCE_SERVICE_HOST) to start..."