Merge pull request #473 from stackhpc/upstream/2025.1-2025-09-15

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-latest.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-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-latest.x86_64.qcow2
+  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the infra VM data volume.

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-latest.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/kolla.yml

@@ -86,7 +86,7 @@
 # case Quay.io will be used.
 #kolla_docker_registry:
 
-# Docker namespace to use for Kolla images. Default is 'kolla'.
+# Docker namespace to use for Kolla images. Default is 'openstack.kolla'.
 #kolla_docker_namespace:
 
 # Username to use to access a docker registry. Default is not set, in which

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-latest.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

playbooks/kayobe-infra-vm-base/overrides.yml.j2

@@ -31,9 +31,11 @@ infra_vm_vcpus: 1
 # Reduce the memory footprint of the infra VM.
 infra_vm_memory_mb: "{{ 1 * 1024 }}"
 
-# Use cirros rather than CentOS for the VM.
+{% if infra_vm_use_cirros | default(true) %}
+# Use cirros rather than distribution cloud image for the VM.
 infra_vm_bootstrap_user: cirros
 infra_vm_root_image: /opt/cache/files/cirros-0.5.3-x86_64-disk.img
+{% endif %}
 
 # Cirros doesn't load cdom drivers by default.
 vm_configdrive_device: disk

zuul.d/jobs.yaml

@@ -472,3 +472,26 @@
     name: kayobe-infra-vm-ubuntu-noble
     parent: kayobe-infra-vm-base
     nodeset: kayobe-ubuntu-noble
+
+- job:
+    name: kayobe-infra-vm-centos9s-cloud-image
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-centos9s
+    voting: false
+    vars:
+      infra_vm_use_cirros: false
+
+- job:
+    name: kayobe-infra-vm-rocky9-cloud-image
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-rocky9
+    vars:
+      infra_vm_use_cirros: false
+
+- job:
+    name: kayobe-infra-vm-ubuntu-noble-cloud-image
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-ubuntu-noble
+    voting: false
+    vars:
+      infra_vm_use_cirros: false

zuul.d/project.yaml

@@ -71,6 +71,9 @@
 
     experimental:
       jobs:
+        - kayobe-infra-vm-centos9s-cloud-image
+        - kayobe-infra-vm-rocky9-cloud-image
+        - kayobe-infra-vm-ubuntu-noble-cloud-image
         - kayobe-overcloud-centos9s
         - kayobe-overcloud-host-configure-centos9s
         - kayobe-seed-images-centos9s