Merge branch 'stackhpc/2024.1' into 2024.1-bump-ovs/ovn

Author: bbezak

etc/kayobe/kolla-image-tags.yml

@@ -30,8 +30,9 @@ kolla_image_tags:
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
     ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
   magnum:
-    rocky-9: 2024.1-rocky-9-20250102T094625
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20250102T094625
+    rocky-9: 2024.1-rocky-9-20250522T143506
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506
+    ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506
   manila:
     rocky-9: 2024.1-rocky-9-20250529T081147
     ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147

etc/kayobe/kolla.yml

@@ -403,7 +403,7 @@ kolla_build_customizations_common:
     - /additions/*
   magnum_base_pip_packages_override:
     - /magnum[osprofiler]
-    - magnum-capi-helm==1.2.0
+    - magnum-capi-helm==1.2.1
   neutron_server_packages_append:
     - python3-libvirt
     - python3-ethtool

releasenotes/notes/capi-bump-78cd6f89a0eff0d7.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Updated the version of magnum-capi-helm used in Magnum containers. This
+    resolves an issue stopping non-default node groups from being deleted. See
+    `#2095539 <https://bugs.launchpad.net/magnum/+bug/2095539>`__ for more
+    details.