From 7b926a37a4495ae3fbf57999947a7c9d1b489a41 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Mon, 11 Aug 2025 10:35:10 +0100
Subject: [PATCH 1/3] Use upstream Magnum

Our downstream Magnum was for keeping Heat driver support.
But we dropped them, so there's no need to build magnum from downstream.
---
 etc/kayobe/kolla.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 2c8776351..14e3045e2 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -139,10 +139,6 @@ kolla_sources:
     type: git
     location: https://github.com/stackhpc/keystone.git
     reference: stackhpc/{{ openstack_release }}
-  magnum-base:
-    type: git
-    location: https://github.com/stackhpc/magnum.git
-    reference: stackhpc/{{ openstack_release }}
   neutron-server-plugin-networking-mlnx:
     type: git
     location: https://github.com/stackhpc/networking-mlnx.git

From 61a6a7d75ea43a6cc07d7f0e57bc1aefb5ab778e Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Mon, 11 Aug 2025 13:42:34 +0100
Subject: [PATCH 2/3] Build magnum from upstream source

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

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index b115b7185..02be3da74 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -10,5 +10,5 @@ kolla_image_tags:
     rocky-9: 2025.1-rocky-9-20250805T134044
     ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044
   magnum:
-    rocky-9: 2025.1-rocky-9-20250805T095746
-    ubuntu-noble: 2025.1-ubuntu-noble-20250805T095746
+    rocky-9: 2025.1-rocky-9-20250811T111154
+    ubuntu-noble: 2025.1-ubuntu-noble-20250811T111154

From 0aad6eb9d31fe044e4b8c1f688a336d890fe0df8 Mon Sep 17 00:00:00 2001
From: Seunghun Lee <seunghun@stackhpc.com>
Date: Tue, 12 Aug 2025 10:50:15 +0100
Subject: [PATCH 3/3] Add release note

---
 .../notes/use-upstream-magnum-86854beee69151f5.yaml       | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/use-upstream-magnum-86854beee69151f5.yaml

diff --git a/releasenotes/notes/use-upstream-magnum-86854beee69151f5.yaml b/releasenotes/notes/use-upstream-magnum-86854beee69151f5.yaml
new file mode 100644
index 000000000..70adb9333
--- /dev/null
+++ b/releasenotes/notes/use-upstream-magnum-86854beee69151f5.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Use upstream source of Magnum for Kolla container image build.
+    The StackHPC downstream Magnum repository was for keeping Heat driver
+    support.
+    As Heat support was deprecated, there's no need to build Magnum from
+    downstream source.