Merge branch 'stackhpc/2024.1' into fix-ci-aio-networking

Author: jackhodgkiss

.github/workflows/stackhpc-all-in-one.yml

@@ -211,6 +211,14 @@ jobs:
           ${{ steps.tf_outputs.outputs.stdout }}
           EOF
 
+      - name: Write Terraform network config
+        run: |
+          cat << EOF > etc/kayobe/environments/$KAYOBE_ENVIRONMENT/tf-networks.yml
+          admin_oc_net_name: ethernet
+          ethernet_ips:
+            controller0: "{{ access_ip_v4.value }}"
+          EOF
+
       - name: Write all-in-one scenario config
         run: |
           cat << EOF > etc/kayobe/environments/$KAYOBE_ENVIRONMENT/zz-aio-scenario.yml

etc/kayobe/kolla-image-tags.yml

@@ -5,27 +5,24 @@
 kolla_image_tags:
   openstack:
     rocky-9: 2024.1-rocky-9-20240903T113235
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20240917T091559
   heat:
     rocky-9: 2024.1-rocky-9-20240805T142526
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526
   nova:
-    rocky-9: 2024.1-rocky-9-20240918T164436
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436
+    rocky-9: 2024.1-rocky-9-20241004T094540
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540
   neutron:
-    rocky-9: 2024.1-rocky-9-20240918T164436
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436
+    rocky-9: 2024.1-rocky-9-20241025T090323
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241025T090323
   octavia:
-    rocky-9: 2024.1-rocky-9-20240926T144142
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142
+    rocky-9: 2024.1-rocky-9-20241004T094540
+    ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540
   horizon:
     rocky-9: 2024.1-rocky-9-20240909T144917
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240909T144917
   bifrost_deploy:
     rocky-9: 2024.1-rocky-9-20240725T165045
   prometheus:
     rocky-9: 2024.1-rocky-9-20240910T072617
-    ubuntu-jammy: 2024.1-ubuntu-jammy-20240910T072617
   rabbitmq:
     rocky-9: 2024.1-rocky-9-20240927T152945
   ironic:

etc/kayobe/kolla/kolla-build.conf

@@ -3,7 +3,7 @@
 {# snapshots, so pin to a specific tag. #}
 {# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
 {% if kolla_base_distro == 'ubuntu' %}
-base_tag = jammy-20231004
+base_tag = jammy-20240808
 {# Similarly pinning to Rocky 9 minor version used in our repos #}
 {% elif kolla_base_distro == 'rocky' %}
 base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}

etc/kayobe/stackhpc.yml

@@ -149,11 +149,7 @@ stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-# FIXME: Waiting for
-# https://review.opendev.org/c/openstack/kolla-ansible/+/926198 to merge and
-# sync to stackhpc/2024.1
-# stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
-stackhpc_kolla_ansible_source_version: "fix-prometheus"
+stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
 
 ###############################################################################
 # Container image registry

releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Bumped the base image for Ubuntu 22.04 containers.
+  - |
+    Additionally bumped Nova, Neutron and Octavia images for
+    both Rocky and Ubuntu.