From 97099183e4e0aef29d86a2c3e7da7df5982ad125 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Fri, 15 Nov 2024 12:19:54 -0600
Subject: [PATCH] [glance] Add override for downloading Ubuntu image

We used to add the Ubuntu image to the list of
images to download during the glance bootstrap
in one of our test script. This image is mostly
used for debugging and when cirros is incompatible
with infra VMs. So let's add glance values override
file specifically for this and enable it only when
necessary.

Change-Id: I5c10dac4826c3ea10327e4934bbeab27b54877e2
---
 glance/Chart.yaml                                   |  2 +-
 glance/values_overrides/bootstrap-ubuntu-image.yaml | 11 +++++++++++
 releasenotes/notes/glance.yaml                      |  1 +
 tools/deployment/component/glance/glance.sh         | 11 -----------
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 glance/values_overrides/bootstrap-ubuntu-image.yaml

diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index 1237f643fa..466816e45b 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.5.2
+version: 0.5.3
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/values_overrides/bootstrap-ubuntu-image.yaml b/glance/values_overrides/bootstrap-ubuntu-image.yaml
new file mode 100644
index 0000000000..dfdc7b7343
--- /dev/null
+++ b/glance/values_overrides/bootstrap-ubuntu-image.yaml
@@ -0,0 +1,11 @@
+bootstrap:
+  structured:
+    images:
+      ubuntu_miniaml:
+        name: "Ubuntu Jammy Minimal"
+        source_url: "https://cloud-images.ubuntu.com/minimal/releases/jammy/release/"
+        image_file: "ubuntu-22.04-minimal-cloudimg-amd64.img"
+        id: null
+        min_disk: 3
+        image_type: qcow2
+        container_format: bare
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index c2bd3ecad2..8e2193cac8 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -63,4 +63,5 @@ glance:
   - 0.5.0 Remove deprecated config options `stores` and `default_store`
   - 0.5.1 Add 2024.2 Ubuntu Jammy overrides
   - 0.5.2 Fix HTTP healthcheck URLs for Kubernetes probes
+  - 0.5.3 Add override for downloading Ubuntu image
 ...
diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh
index d7e082c586..6d98c164b7 100755
--- a/tools/deployment/component/glance/glance.sh
+++ b/tools/deployment/component/glance/glance.sh
@@ -24,17 +24,6 @@ set -xe
 #NOTE: Deploy command
 tee /tmp/glance.yaml <<EOF
 storage: ${GLANCE_BACKEND}
-bootstrap:
-  structured:
-    images:
-      ubuntu_miniaml:
-        name: "Ubuntu Jammy Minimal"
-        source_url: "https://cloud-images.ubuntu.com/minimal/releases/jammy/release/"
-        image_file: "ubuntu-22.04-minimal-cloudimg-amd64.img"
-        id: null
-        min_disk: 3
-        image_type: qcow2
-        container_format: bare
 EOF
 
 helm upgrade --install glance ${OSH_HELM_REPO}/glance \