From 99e6fb9d658e2dd7d1c627be1093950d1a5588e8 Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Wed, 2 Oct 2024 13:24:52 +0100
Subject: [PATCH 1/5] Update base blazar image

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index c7fcc0675..6e90504c1 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -159,6 +159,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/octavia.git
     reference: stackhpc/{{ openstack_release }}
+  blazar-base:
+    type: git
+    location: https://github.com/stackhpc/blazar
+    reference: flavor-based-reservation5
 
 ###############################################################################
 # Kolla image build configuration.

From 40476e6a5a4dd0013b44e87115fd7fb5903d35c9 Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Wed, 2 Oct 2024 14:48:11 +0100
Subject: [PATCH 2/5] Update Blazar tag

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

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 017319e3d..ace4fae52 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -8,6 +8,8 @@ kolla_image_tags:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240621T104542
   bifrost_deploy:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240423T125905
+  blazar:
+    rocky-9: 2023.1-rocky-9-20241002T133312
   cinder:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
   glance:

From 48601fea1beba9130b614ae51404e8a149ea7270 Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Thu, 7 Nov 2024 11:31:28 +0000
Subject: [PATCH 3/5] Add a release note

---
 etc/kayobe/kolla.yml                                         | 2 +-
 releasenotes/notes/update-blazar-image-d176c27d55716469.yaml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/update-blazar-image-d176c27d55716469.yaml

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 6e90504c1..8be675511 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -162,7 +162,7 @@ kolla_sources:
   blazar-base:
     type: git
     location: https://github.com/stackhpc/blazar
-    reference: flavor-based-reservation5
+    reference: stackhpc/master
 
 ###############################################################################
 # Kolla image build configuration.
diff --git a/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml b/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml
new file mode 100644
index 000000000..d877a24d9
--- /dev/null
+++ b/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Use the stackhpc fork for building Blazar images with customizations to support
+    flavor-based reservation.

From cb96576630eede9f2697e7c5f8a2e141bfddfa7b Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Thu, 7 Nov 2024 14:02:05 +0000
Subject: [PATCH 4/5] Update Kolla tags for Blazar

---
 etc/kayobe/kolla-image-tags.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 02916207f..11faa6a44 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -9,7 +9,8 @@ kolla_image_tags:
   bifrost_deploy:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240423T125905
   blazar:
-    rocky-9: 2023.1-rocky-9-20241002T133312
+    rocky-9: 2023.1-rocky-9-20241107T140552
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20241107T140552
   cinder:
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
   glance:

From 1190f4e0cc744b0322831017c105303d6f0f57d7 Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <39007539+assumptionsandg@users.noreply.github.com>
Date: Tue, 12 Nov 2024 09:41:17 +0000
Subject: [PATCH 5/5] Update
 releasenotes/notes/update-blazar-image-d176c27d55716469.yaml

Co-authored-by: Alex-Welsh <112560678+Alex-Welsh@users.noreply.github.com>
---
 releasenotes/notes/update-blazar-image-d176c27d55716469.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml b/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml
index d877a24d9..7e53b3543 100644
--- a/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml
+++ b/releasenotes/notes/update-blazar-image-d176c27d55716469.yaml
@@ -1,5 +1,5 @@
 ---
 features:
   - |
-    Use the stackhpc fork for building Blazar images with customizations to support
+    Use the StackHPC fork for building Blazar images with customizations to support
     flavor-based reservation.