Browse code
Run Glance initialization when Glance is enabled, not just registry
Per [1] Glance registry should not be required to run since Queens.
[1] https://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html
Change-Id: I5477c8769ff4ae151d4d6ccb5e5d8dd5788909b0
Closes-bug: #1859847
Radosław Piliszek authored on 2020/01/16 02:30:36Showing 1 changed files
| ... | ... |
@@ -1155,7 +1155,7 @@ fi |
| 1155 | 1155 |
# Glance |
| 1156 | 1156 |
# ------ |
| 1157 | 1157 |
|
| 1158 |
-if is_service_enabled g-reg; then |
|
| 1158 |
+if is_glance_enabled; 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_service_enabled g-reg; then |
|
| 1283 |
+if is_glance_enabled; then |
|
| 1284 | 1284 |
|
| 1285 | 1285 |
echo_summary "Uploading images" |
| 1286 | 1286 |
|