1. devstack
  2. Commit 96269d8e758e168fb857fca6e96cbd9a50628ac0
Browse code

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

The glance-api service may use multiple config files, so
tell oslo.config about the config dir instead of a specific
config file when the service is started.

Change-Id: Iad3602d209cbb31e10683c67e1fd6b465d19f560
Partial-bug: #1805765

Brian Rosmaita authored on 2018/12/18 00:38:42
Showing 1 changed files
lib/glance
History View file @ 96269d8
... ... 
@@ -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..."