Merge pull request #437 from stackhpc/upstream/2025.1-2025-06-23

Synchronise 2025.1 with upstream

Author: priteau

ansible/inventory/group_vars/all/infra-vms

@@ -46,15 +46,15 @@ infra_vm_root_format: qcow2
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 infra_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
   https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2
+  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the infra VM data volume.

ansible/inventory/group_vars/all/seed-vm

@@ -46,15 +46,15 @@ seed_vm_root_format: qcow2
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 seed_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
   https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2
+  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the seed VM data volume.

ansible/roles/manage-containers/tasks/deploy.yml

@@ -10,7 +10,7 @@
   become: "{{ container_engine == 'podman' }}"
 
 - name: Deploy containers (loop)
-  include_tasks: deploy.yml
+  include_tasks: deploy-container.yml
   vars:
     container_name: "{{ item.key }}"
     container_config: "{{ item.value }}"

etc/kayobe/infra-vms.yml

@@ -35,7 +35,7 @@
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/seed-vm.yml

@@ -35,7 +35,7 @@
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

playbooks/kayobe-seed-base/overrides.yml.j2

@@ -57,3 +57,16 @@ kolla_base_distro: "{% raw %}{{ 'rocky' if os_distribution == 'centos' else os_d
 
 # Support overriding container_engine
 container_engine: "{{ container_engine }}"
+
+# Test deployment of custom seed containers
+seed_containers:
+  node_exporter:
+    image: "quay.io/prometheus/node-exporter"
+    tag: "latest"
+
+{% if ansible_os_family == "Debian" %}
+# TODO(priteau): Required for running some containers on Ubuntu + Podman.
+# Remove once installed by ansible-collection-kolla.
+dev_tools_packages_extra:
+  - "catatonit"
+{% endif %}

releasenotes/notes/fix-deploy-containers-24da0992b56a10db.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes an infinite loop when deploying seed containers.
+    `LP#2114845 <https://bugs.launchpad.net/kayobe/+bug/2114845>`__

releasenotes/notes/use-latest-centos-stream-9-image-d23c5a3f5c3a3914.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Updates the default cloud image for CentOS Stream 9 deployments to use
+    ``CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2``.