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

This commit is contained in:
Zuul 2020-01-16 07:23:33 +00:00 committed by Gerrit Code Review
commit decb662ff3

@ -1155,7 +1155,7 @@ fi
# Glance # Glance
# ------ # ------
if is_service_enabled g-reg; then if is_glance_enabled; then
echo_summary "Configuring Glance" echo_summary "Configuring Glance"
init_glance init_glance
fi fi
@ -1280,7 +1280,7 @@ fi
# scripts as userdata. # scripts as userdata.
# See https://help.ubuntu.com/community/CloudInit for more on ``cloud-init`` # See https://help.ubuntu.com/community/CloudInit for more on ``cloud-init``
if is_service_enabled g-reg; then if is_glance_enabled; then
echo_summary "Uploading images" echo_summary "Uploading images"