From 0265a2cb763affdbf6615f5c76ad8b17ff015279 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 28 Nov 2024 16:22:28 +0000
Subject: [PATCH 1/2] Use downstream Bifrost

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

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 20d5b1ac5..cdfa42ab1 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -117,6 +117,10 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
     reference: 1.3.0
+  bifrost-base:
+    type: git
+    location: https://github.com/stackhpc/bifrost.git
+    reference: stackhpc/{{ openstack_release }}
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git

From e982c660456b41fb81ca7c229dae9b451772480e Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Thu, 28 Nov 2024 17:08:15 +0000
Subject: [PATCH 2/2] Bump Bifrost to fix httpboot config templating

---
 etc/kayobe/kolla-image-tags.yml                            | 5 +++--
 ...ifrost-httpboot-config-templating-0488dd14d15d65e4.yaml | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/fix-bifrost-httpboot-config-templating-0488dd14d15d65e4.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 9919548cb..341386c22 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -22,8 +22,9 @@ kolla_image_tags:
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540
   horizon:
     rocky-9: 2024.1-rocky-9-20240909T144917
-  bifrost_deploy:
-    rocky-9: 2024.1-rocky-9-20240725T165045
+  bifrost:
+    rocky-9: 2024.1-rocky-9-20241128T162336
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241128T162336
   prometheus:
     rocky-9: 2024.1-rocky-9-20240910T072617
   rabbitmq:
diff --git a/releasenotes/notes/fix-bifrost-httpboot-config-templating-0488dd14d15d65e4.yaml b/releasenotes/notes/fix-bifrost-httpboot-config-templating-0488dd14d15d65e4.yaml
new file mode 100644
index 000000000..5ed9cb7c8
--- /dev/null
+++ b/releasenotes/notes/fix-bifrost-httpboot-config-templating-0488dd14d15d65e4.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Bumps Bifrost container image tags to fix `bug 2072550
+    <https://bugs.launchpad.net/kayobe/+bug/2072550>`__ which adds
+    leading and trailing whitespace for ``inspection_callback_url``
+    in httpboot config when templating.