commit 63f07a1af99011a2e6c73ae812b4e8343c97c0ab
author Zuul <zuul@review.opendev.org> Sun Jan 19 08:43:34 2020 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jan 19 08:43:35 2020 +0000
tree f87beb719d098a6b345bd0a6b12537e28ee8b284
parent c615f37c9329d521ec98f00d5be5c6ee048f5335
parent 48d1f028c43dd26aab852715e451e1ec08421a2f

Merge "Revert "Run Glance initialization when Glance is enabled, not just registry""

lib/glance

diff --git a/lib/glance b/lib/glance
index 740bcab..b4cab2a 100644
--- a/lib/glance
+++ b/lib/glance
@@ -276,16 +276,18 @@
     rm -rf $GLANCE_IMAGE_DIR
     mkdir -p $GLANCE_IMAGE_DIR
 
-    # (Re)create glance database
-    recreate_database glance
+    if is_service_enabled $DATABASE_BACKENDS; then
+        # (Re)create glance database
+        recreate_database glance
 
-    time_start "dbsync"
-    # Migrate glance database
-    $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_sync
+        time_start "dbsync"
+        # Migrate glance database
+        $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_sync
 
-    # Load metadata definitions
-    $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_load_metadefs
-    time_stop "dbsync"
+        # Load metadata definitions
+        $GLANCE_BIN_DIR/glance-manage --config-file $GLANCE_CONF_DIR/glance-api.conf db_load_metadefs
+        time_stop "dbsync"
+    fi
 }
 
 # install_glanceclient() - Collect source and prepare