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

This reverts commit d8dec362ba. This has
knock on effects for devstack-gate, which configures g-api on subnodes
node but not mysql, resulting in failures. A longer term fix would be to
either a) stop configuring g-api on subnodes if we can determine it's
not necessary or b) only configure the database if on the main node.
However, both options are subject to debate so for now just unclog the
gate.

Change-Id: I58baa3b6c63c648836ae8152c2d6d7ceff11a388
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Closes-bug: #1860021
This commit is contained in:
Stephen Finucane 2020-01-17 17:23:11 +00:00
parent 98f3bbe509
commit 48d1f028c4
1 changed files with 2 additions and 2 deletions

View File

@ -1155,7 +1155,7 @@ fi
# Glance
# ------
if is_glance_enabled; then
if is_service_enabled g-reg; then
echo_summary "Configuring Glance"
init_glance
fi
@ -1280,7 +1280,7 @@ fi
# 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"