Merge branch 'stackhpc/2023.1' into feature/yoga/redfish-exporter

Author: GregWhiteyBialas

etc/kayobe/kolla-image-tags.yml

@@ -12,12 +12,14 @@ kolla_image_tags:
   heat:
     rocky-9: 2023.1-rocky-9-20240319T134201
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240319T134201
+  horizon:
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20240402T104530
   letsencrypt:
     rocky-9: 2023.1-rocky-9-20240205T162323
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240221T133905
   magnum:
-    rocky-9: 2023.1-rocky-9-20240320T133822
-    ubuntu-jammy: 2023.1-ubuntu-jammy-20240320T133822
+    rocky-9: 2023.1-rocky-9-20240411T125311
+    ubuntu-jammy: 2023.1-ubuntu-jammy-20240411T125311
   neutron:
     rocky-9: 2023.1-rocky-9-20240202T145927
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240221T103817

etc/kayobe/kolla.yml

@@ -328,7 +328,7 @@ kolla_build_blocks:
   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 = ['git+https://github.com/stackhpc/magnum-capi-helm.git@v0.12.0'] %}
+    {% set magnum_capi_packages = ['git+https://github.com/stackhpc/magnum-capi-helm.git@v0.13.0'] %}
     RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
     {% endraw %}
 # Dict mapping image customization variable names to their values.

releasenotes/notes/bump-horizon-694d426decbf7df3.yaml

@@ -0,0 +1,5 @@
+---
+security:
+  - |
+    Update Horizon on Ubuntu to include apache2 package ``2.4.52-1ubuntu4.8``
+    which fixes CVE-2023-31122.

releasenotes/notes/bump-magnum-capi-helm-d766b5956de65d31.yaml

@@ -0,0 +1,4 @@
+---
+ features:
+   - |
+     Updates Magnum CAPI Helm driver version to v0.13.0