From 48d1f028c43dd26aab852715e451e1ec08421a2f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 17 Jan 2020 17:23:11 +0000 Subject: [PATCH] Revert "Run Glance initialization when Glance is enabled, not just registry" This reverts commit d8dec362baa2bf7f6ffe1c47352fdbe032eaf20a. 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 Closes-bug: #1860021 --- stack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.sh b/stack.sh index dee84fa8e2..089510fa48 100755 --- a/stack.sh +++ b/stack.sh @@ -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"