From 1aa81ecb401c72b05ef1b9902c11a7abdde8a8f2 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 13 Feb 2025 10:25:12 +0000
Subject: [PATCH 1/2] Use downstream Glance to fix bug #2086675

---
 etc/kayobe/kolla.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 298be1355..68a3da9f5 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -125,6 +125,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
     reference: stackhpc/{{ openstack_release }}
+  glance-base:
+    type: git
+    location: https://github.com/stackhpc/glance
+    reference: stackhpc/{{ openstack_release }}
   horizon-plugin-cloudkitty-dashboard:
     type: git
     location: https://github.com/stackhpc/cloudkitty-dashboard.git
@@ -352,6 +356,9 @@ kolla_build_blocks:
 kolla_build_customizations_common:
   bifrost_base_pip_packages_append:
     - /additions/*
+  glance_base_pip_packages_override:
+    - "/glance"
+    - "glance_store[cinder,vmware,swift,s3]@git+https://github.com/stackhpc/glance_store@stackhpc/4.7.0.3"
   ironic_inspector_pip_packages_append:
     - /additions/*
   magnum_base_pip_packages_override:

From d20a534852141cd8db679e0e4fbca608b1ec78d5 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 13 Feb 2025 11:14:23 +0000
Subject: [PATCH 2/2] Bump glance to fix bug #2086675

---
 etc/kayobe/kolla-image-tags.yml                              | 3 +++
 .../bump-glance-to-fix-bug-2086675-303542d3208103b9.yaml     | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/bump-glance-to-fix-bug-2086675-303542d3208103b9.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 86808509f..8b7dfcbc2 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -6,6 +6,9 @@ kolla_image_tags:
   openstack:
     rocky-9: 2024.1-rocky-9-20241218T141751
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
+  glance:
+    rocky-9: 2024.1-rocky-9-20250213T103134
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134
   horizon:
     rocky-9: 2024.1-rocky-9-20250203T171853
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250203T171853
diff --git a/releasenotes/notes/bump-glance-to-fix-bug-2086675-303542d3208103b9.yaml b/releasenotes/notes/bump-glance-to-fix-bug-2086675-303542d3208103b9.yaml
new file mode 100644
index 000000000..49f258bf8
--- /dev/null
+++ b/releasenotes/notes/bump-glance-to-fix-bug-2086675-303542d3208103b9.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix `bug 2086675: <https://bugs.launchpad.net/glance/+bug/2086675>__`
+    Performance regression for Glance with RBD backend.