From c99f994e86c876caca7c685d73a002094e128d4e Mon Sep 17 00:00:00 2001
From: Alex Welsh <alex@stackhpc.com>
Date: Thu, 30 Jul 2026 11:11:07 +0100
Subject: [PATCH] Switch to upstream blazar

---
 etc/kayobe/kolla-image-tags.yml                       |  4 ++++
 etc/kayobe/kolla.yml                                  |  4 ----
 .../build-blazar-from-upstream-fd5fc48f9bd677e0.yaml  | 11 +++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/build-blazar-from-upstream-fd5fc48f9bd677e0.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 1697100e98..86057d611c 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -7,3 +7,7 @@ kolla_image_tags:
     rocky-9: 2025.1-rocky-9-20260707T061355
     rocky-10: 2025.1-rocky-10-20260707T061355
     ubuntu-noble: 2025.1-ubuntu-noble-20260707T061355
+  blazar:
+    rocky-9: 2025.1-rocky-9-20260730T151535
+    rocky-10: 2025.1-rocky-10-20260730T151535
+    ubuntu-noble: 2025.1-ubuntu-noble-20260730T151535
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index de359ba455..82b49b00c1 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -179,10 +179,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/networking-mlnx.git
     reference: stackhpc/{{ openstack_release }}
-  blazar-base:
-    type: git
-    location: https://github.com/stackhpc/blazar.git
-    reference: stackhpc/master
   # TODO(technowhizz): Remove in 2026.1 on openstacksdk >= 4.9.0
   # https://review.opendev.org/c/openstack/openstacksdk/+/970135
   horizon:
diff --git a/releasenotes/notes/build-blazar-from-upstream-fd5fc48f9bd677e0.yaml b/releasenotes/notes/build-blazar-from-upstream-fd5fc48f9bd677e0.yaml
new file mode 100644
index 0000000000..34431d3990
--- /dev/null
+++ b/releasenotes/notes/build-blazar-from-upstream-fd5fc48f9bd677e0.yaml
@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Rebuilt Blazar containers using the upstream Blazar source code, instead of
+    the StackHPC fork. The StackHPC fork was based on an older version of
+    Blazar, but contained additional features relating to coral credits, which
+    are now no longer in use.
+deprecations:
+  - |
+    The StackHPC-specific Coral Credits features of Blazar are no longer
+    included, and the Blazar source has been reverted to the upstream default.