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""

stack.sh

diff --git a/stack.sh b/stack.sh
index dee84fa..089510f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1155,7 +1155,7 @@
 # Glance
 # ------
 
-if is_glance_enabled; then
+if is_service_enabled g-reg; then
     echo_summary "Configuring Glance"
     init_glance
 fi
@@ -1280,7 +1280,7 @@
 # scripts as userdata.
 # See https://help.ubuntu.com/community/CloudInit for more on ``cloud-init``
 
-if is_glance_enabled; then
+if is_service_enabled g-reg; then
 
     echo_summary "Uploading images"