From 535ae17b78ef795c196d181b0ff9c399c117e100 Mon Sep 17 00:00:00 2001
From: Piotr Parczewski <piotr@stackhpc.com>
Date: Fri, 24 Jan 2025 11:43:06 +0100
Subject: [PATCH] Use Caracal's Magnum

---
 etc/kayobe/kolla-image-tags.yml                          | 3 +++
 etc/kayobe/kolla.yml                                     | 9 +++------
 etc/kayobe/kolla/globals.yml                             | 7 -------
 .../notes/update-magnum-containers-8814b1425ec45fc0.yaml | 5 +++++
 4 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml

diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 9d6d7580e..8265d8954 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -6,3 +6,6 @@ kolla_image_tags:
   openstack:
     rocky-9: 2024.1-rocky-9-20241218T141751
     ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
+  magnum:
+    rocky-9: 2024.1-rocky-9-20250102T094625
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250102T094625
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index b7e75fd8f..f98bf2221 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -342,12 +342,6 @@ kolla_build_blocks:
         && grafana-cli plugins install grafana-opensearch-datasource
   ironic_inspector_header: |
     ADD additions-archive /
-  magnum_base_footer: |
-    RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
-    {% raw %}
-    {% set magnum_capi_packages = ['magnum-capi-helm==1.1.0'] %}
-    RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
-    {% endraw %}
 
 # Dict mapping image customization variable names to their values.
 # Each variable takes the form:
@@ -360,6 +354,9 @@ kolla_build_customizations_common:
     - /additions/*
   ironic_inspector_pip_packages_append:
     - /additions/*
+  magnum_base_pip_packages_override:
+    - /magnum[osprofiler]
+    - magnum-capi-helm==1.2.0
   neutron_server_packages_append:
     - python3-libvirt
     - python3-ethtool
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 30d3af9bb..c36b659b5 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -22,13 +22,6 @@ kolla_image_tags:
 # Variables defining which tag to use for each container's image.
 {{ lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tag-vars') }}
 
-# FIXME: Pin to Antelope Magnum until it is working again upstream
-kayobe_image_tags:
-  magnum:
-    rocky: 2023.1-rocky-9-20240821T102442
-    ubuntu: 2023.1-ubuntu-jammy-20240821T102442
-
-magnum_tag: "{% raw %}{{ kayobe_image_tags['magnum'][kolla_base_distro] }}{% endraw %}"
 #############################################################################
 # Monitoring and alerting related settings
 
diff --git a/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml b/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml
new file mode 100644
index 000000000..9f6a18282
--- /dev/null
+++ b/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml
@@ -0,0 +1,5 @@
+fixes:
+  - |
+    Updates Magnum to a proper Caracal release version following critical bug
+    upstream merged & backported. Also, updates CAPI Helm driver version to the
+    latest (1.2.0).