Browse code
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 <sfinucan@redhat.com>
Closes-bug: #1860021
Stephen Finucane authored on 2020/01/18 02:23:11Showing 1 changed files
| ... | ... |
@@ -1155,7 +1155,7 @@ fi |
| 1155 | 1155 |
# Glance |
| 1156 | 1156 |
# ------ |
| 1157 | 1157 |
|
| 1158 |
-if is_glance_enabled; then |
|
| 1158 |
+if is_service_enabled g-reg; then |
|
| 1159 | 1159 |
echo_summary "Configuring Glance" |
| 1160 | 1160 |
init_glance |
| 1161 | 1161 |
fi |
| ... | ... |
@@ -1280,7 +1280,7 @@ fi |
| 1280 | 1280 |
# scripts as userdata. |
| 1281 | 1281 |
# See https://help.ubuntu.com/community/CloudInit for more on ``cloud-init`` |
| 1282 | 1282 |
|
| 1283 |
-if is_glance_enabled; then |
|
| 1283 |
+if is_service_enabled g-reg; then |
|
| 1284 | 1284 |
|
| 1285 | 1285 |
echo_summary "Uploading images" |
| 1286 | 1286 |
|