Browse code

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

Zuul authored on 2019/02/14 20:23:25
Showing 1 changed files
... ...
@@ -345,7 +345,7 @@ function start_glance {
345 345
     if [[ "$WSGI_MODE" == "uwsgi" ]]; then
346 346
         run_process g-api "$GLANCE_BIN_DIR/uwsgi --procname-prefix glance-api --ini $GLANCE_UWSGI_CONF"
347 347
     else
348
-        run_process g-api "$GLANCE_BIN_DIR/glance-api --config-file=$GLANCE_CONF_DIR/glance-api.conf"
348
+        run_process g-api "$GLANCE_BIN_DIR/glance-api --config-dir=$GLANCE_CONF_DIR"
349 349
     fi
350 350
 
351 351
     echo "Waiting for g-api ($GLANCE_SERVICE_HOST) to start..."