Support CentOS Stream 10 and Rocky Linux 10 images

This bumps the jriguera.configdrive role to the latest commit to support
generating a configdrive with xorriso instead of genisoimage.

Depends-On: https://review.opendev.org/c/openstack/kayobe-config-dev/+/962548

Change-Id: Ia2881915531a74414cda44b676167cf9360c55b7
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>

ansible/inventory/group_vars/all/globals

@@ -52,9 +52,10 @@ kayobe_ansible_user: "stack"
 # is "rocky".
 os_distribution: "rocky"
 
-# OS release. Valid options are "9-stream" when os_distribution is "centos", or
+# OS release. Valid options are "9-stream" and "10-stream" (with "9-stream"
-# "9" when os_distribution is "rocky", or "noble" when os_distribution is
+# being the default) when os_distribution is "centos", "9" and "10" (with "9"
-# "ubuntu".
+# being the default) when os_distribution is "rocky", or "noble" when
+# os_distribution is "ubuntu".
 os_release: >-
   {{ '9-stream' if os_distribution == 'centos'
   else '9' if os_distribution == 'rocky'

ansible/inventory/group_vars/all/infra-vms

@@ -42,19 +42,30 @@ infra_vm_root_format: qcow2
 
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
+# when os_distribution is "ubuntu",
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
-# when os_distribution is "rocky",
+# when os_distribution is "rocky" and os_release is "9",
-# or
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "10",
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
+# when os_distribution is "centos" and os_release is "9-stream", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-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' %}
+  {%- if os_release == '9' %}
   https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
+  https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2
+  {%- endif %}
+  {%- else -%}
+  {%- if os_release == '9-stream' %}
   https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2
+  {%- else -%}
+  https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2
+  {%- endif %}
   {%- endif %}
 
 # Capacity of the infra VM data volume.

ansible/inventory/group_vars/all/seed-vm

@@ -43,18 +43,29 @@ seed_vm_root_format: qcow2
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
-# when os_distribution is "rocky",
+# when os_distribution is "rocky" and os_release is "9",
-# or
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "10",
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
+# when os_distribution is "centos" and os_release is "9-stream", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-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' %}
+  {%- if os_release == '9' %}
   https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
+  https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2
+  {%- endif %}
+  {%- else -%}
+  {%- if os_release == '9-stream' %}
   https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2
+  {%- else -%}
+  https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2
+  {%- endif %}
   {%- endif %}
 
 # Capacity of the seed VM data volume.

ansible/roles/kolla-ansible/vars/RedHat.yml

@@ -5,6 +5,6 @@ kolla_ansible_package_dependencies:
   - git
   - libffi-devel
   - openssl-devel
-  - python3.12
+  - "{{ 'python3.12' if ansible_facts.distribution_major_version == '9' else 'python3' }}"
-  - python3.12-devel
+  - "{{ 'python3.12-devel' if ansible_facts.distribution_major_version == '9' else 'python3-devel' }}"
   - rsync

doc/source/configuration/reference/os-distribution.rst

@@ -15,10 +15,10 @@ or ``rocky`` or ``ubuntu``, and defaults to ``rocky``.
 
 The ``os_release`` variable in ``etc/kayobe/globals.yml`` can be used to set
 the release of the OS. When ``os_distribution`` is set to ``centos`` it may be
-set to ``9-stream``, and this is its default value. When ``os_distribution`` is
+set to ``9-stream`` or ``10-stream``, and ``9-stream`` is its default value.
-set to ``ubuntu`` it may be set to ``noble``, and this is its default value.
+When ``os_distribution`` is set to ``rocky`` it may be set to ``9`` or ``10``,
-When ``os_distribution`` is set to ``rocky`` it may be set to ``9``, and this
+and ``9`` is its default value.  When ``os_distribution`` is set to ``ubuntu``
-is its default value.
+it may be set to ``noble``, and this is its default value.
 
 These variables are used to set various defaults, including:
 

etc/kayobe/globals.yml

@@ -48,9 +48,10 @@
 # is "rocky".
 #os_distribution:
 
-# OS release. Valid options are "9-stream" when os_distribution is "centos", or
+# OS release. Valid options are "9-stream" and "10-stream" (with "9-stream"
-# "9" when os_distribution is "rocky", or "noble" when os_distribution is
+# being the default) when os_distribution is "centos", "9" and "10" (with "9"
-# "ubuntu".
+# being the default) when os_distribution is "rocky", or "noble" when
+# os_distribution is "ubuntu".
 #os_release:
 
 ###############################################################################

etc/kayobe/infra-vms.yml

@@ -31,11 +31,14 @@
 
 # Base image for the infra VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu", or
+# when os_distribution is "ubuntu",
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
-# when os_distribution is "rocky",
+# when os_distribution is "rocky" and os_release is "9",
-# or
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "10",
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
+# when os_distribution is "centos" and os_release is "9-stream", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/seed-vm.yml

@@ -32,10 +32,13 @@
 # Base image for the seed VM root volume. Default is
 # "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
-# when os_distribution is "rocky",
+# when os_distribution is "rocky" and os_release is "9",
-# or
+# "https://dl.rockylinux.org/pub/rocky/10/images/x86_64/Rocky-10-GenericCloud-Base.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "10",
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
+# when os_distribution is "centos" and os_release is "9-stream", or
+# "https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-10-latest.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

playbooks/kayobe-infra-vm-base/infra-vms-group-vars.j2

@@ -1,8 +1,8 @@
 ---
-{% if infra_vm_use_cirros | default(true) or ansible_os_family != "Debian" %}
+{% if infra_vm_use_cirros | default(true) or ansible_os_family == 'RedHat' and ansible_distribution_major_version == '9' %}
 aio_interface: eth0
 {% else %}
-# Required for Ubuntu cloud images
+# Required for official cloud images (CentOS Stream 10, Rocky Linux 10, Ubuntu)
 aio_interface: ens2
 {% endif %}
 

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

@@ -35,9 +35,6 @@ infra_vm_memory_mb: "{{ 1 * 1024 }}"
 # 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
-{% else %}
-infra_vm_provision_timeout: 600
-{% endif %}
 
 # Cirros doesn't load cdom drivers by default.
 vm_configdrive_device: disk
@@ -46,6 +43,9 @@ vm_configdrive_device: disk
 # /etc/network/interfaces.
 configdrive_os_family: Debian
 configdrive_debian_network_interfaces_supports_glob: false
+{% else %}
+infra_vm_provision_timeout: 600
+{% endif %}
 
 # NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
 # and removes the bridge if there are no interfaces left. When Kayobe bounces

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

@@ -38,6 +38,14 @@ seed_vm_memory_mb: "{{ 1 * 1024 }}"
 # Use cirros rather than distribution cloud image for the VM.
 seed_bootstrap_user: cirros
 seed_vm_root_image: /opt/cache/files/cirros-0.5.3-x86_64-disk.img
+
+# Cirros doesn't load cdom drivers by default.
+seed_vm_configdrive_device: disk
+
+# Cirros is Debian family, but doesn't support path globs in
+# /etc/network/interfaces.
+configdrive_os_family: Debian
+configdrive_debian_network_interfaces_supports_glob: false
 {% else %}
 seed_vm_provision_timeout: 600
 {% endif %}
@@ -49,14 +57,6 @@ seed_vm_boot_firmware: "{{ seed_vm_boot_firmware }}"
 seed_vm_machine: "{{ seed_vm_machine }}"
 {% endif %}
 
-# Cirros doesn't load cdom drivers by default.
-seed_vm_configdrive_device: disk
-
-# Cirros is Debian family, but doesn't support path globs in
-# /etc/network/interfaces.
-configdrive_os_family: Debian
-configdrive_debian_network_interfaces_supports_glob: false
-
 # NOTE(mgoddard): CentOS 8 removes interfaces from their bridge during ifdown,
 # and removes the bridge if there are no interfaces left. When Kayobe bounces
 # veth links plugged into the bridge, it causes the bridge which has the IP we

playbooks/kayobe-seed-vm-base/seed-group-vars.j2

@@ -1,8 +1,8 @@
 ---
-{% if seed_vm_use_cirros | default(true) or ansible_os_family != "Debian" %}
+{% if seed_vm_use_cirros | default(true) or ansible_os_family == 'RedHat' and ansible_distribution_major_version == '9' %}
 aio_interface: eth0
 {% else %}
-# Required for Ubuntu cloud images
+# Required for official cloud images (CentOS Stream 10, Rocky Linux 10, Ubuntu)
 aio_interface: ens2
 {% endif %}
 

requirements.yml

@@ -25,7 +25,7 @@ roles:
     version: 1.2.0
   - src: jriguera.configdrive
     # There are no versioned releases of this role.
-    version: 313c9b0ff8cd8009471380ccd71b27b440ac6704
+    version: 71ddface5540ee0ff9e35bcc4334c766ed5d5d3f
   - src: MichaelRigart.interfaces
     version: v1.15.6
   - src: mrlesmithjr.chrony

zuul.d/jobs.yaml

@@ -385,11 +385,22 @@
     nodeset: kayobe-centos9s
     voting: false
 
+- job:
+    name: kayobe-seed-vm-centos10s
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-centos10s
+    voting: false
+
 - job:
     name: kayobe-seed-vm-rocky9
     parent: kayobe-seed-vm-base
     nodeset: kayobe-rocky9
 
+- job:
+    name: kayobe-seed-vm-rocky10
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-rocky10
+
 - job:
     name: kayobe-seed-vm-ubuntu-noble
     parent: kayobe-seed-vm-base
@@ -405,6 +416,14 @@
     vars:
       seed_vm_use_cirros: false
 
+- job:
+    name: kayobe-seed-vm-centos10s-cloud-image
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-centos10s
+    voting: false
+    vars:
+      seed_vm_use_cirros: false
+
 - job:
     name: kayobe-seed-vm-rocky9-cloud-image
     parent: kayobe-seed-vm-base
@@ -412,6 +431,13 @@
     vars:
       seed_vm_use_cirros: false
 
+- job:
+    name: kayobe-seed-vm-rocky10-cloud-image
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-rocky10
+    vars:
+      seed_vm_use_cirros: false
+
 - job:
     name: kayobe-seed-vm-ubuntu-noble-cloud-image
     parent: kayobe-seed-vm-base
@@ -434,6 +460,12 @@
     nodeset: kayobe-centos9s
     voting: false
 
+- job:
+    name: kayobe-seed-vm-centos10s-q35
+    parent: kayobe-seed-vm-q35-base
+    nodeset: kayobe-centos10s
+    voting: false
+
 - job:
     name: kayobe-seed-vm-rocky9-q35
     parent: kayobe-seed-vm-q35-base
@@ -441,6 +473,13 @@
     vars:
       kayobe_control_host_become: false
 
+- job:
+    name: kayobe-seed-vm-rocky10-q35
+    parent: kayobe-seed-vm-q35-base
+    nodeset: kayobe-rocky10
+    vars:
+      kayobe_control_host_become: false
+
 - job:
     name: kayobe-seed-vm-ubuntu-noble-q35
     parent: kayobe-seed-vm-q35-base
@@ -464,6 +503,12 @@
     nodeset: kayobe-centos9s
     voting: false
 
+- job:
+    name: kayobe-infra-vm-centos10s
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-centos10s
+    voting: false
+
 - job:
     name: kayobe-infra-vm-rocky9
     parent: kayobe-infra-vm-base
@@ -471,6 +516,13 @@
     vars:
       kayobe_control_host_become: false
 
+- job:
+    name: kayobe-infra-vm-rocky10
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-rocky10
+    vars:
+      kayobe_control_host_become: false
+
 - job:
     name: kayobe-infra-vm-ubuntu-noble
     parent: kayobe-infra-vm-base
@@ -484,6 +536,14 @@
     vars:
       infra_vm_use_cirros: false
 
+- job:
+    name: kayobe-infra-vm-centos10s-cloud-image
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-centos10s
+    voting: false
+    vars:
+      infra_vm_use_cirros: false
+
 - job:
     name: kayobe-infra-vm-rocky9-cloud-image
     parent: kayobe-infra-vm-base
@@ -491,6 +551,13 @@
     vars:
       infra_vm_use_cirros: false
 
+- job:
+    name: kayobe-infra-vm-rocky10-cloud-image
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-rocky10
+    vars:
+      infra_vm_use_cirros: false
+
 - job:
     name: kayobe-infra-vm-ubuntu-noble-cloud-image
     parent: kayobe-infra-vm-base

zuul.d/project.yaml

@@ -12,46 +12,54 @@
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule
+        - kayobe-infra-vm-rocky10
+        - kayobe-infra-vm-rocky9
+        - kayobe-infra-vm-ubuntu-noble
+        - kayobe-overcloud-host-configure-rocky10
+        - kayobe-overcloud-host-configure-rocky9
+        - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-ubuntu-noble
         - kayobe-overcloud-ubuntu-noble-podman
-        - kayobe-overcloud-host-configure-rocky9
-        - kayobe-overcloud-host-configure-rocky10
-        - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-ubuntu-noble-podman
         - kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-vm-rocky10
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-noble
-        - kayobe-infra-vm-rocky9
-        - kayobe-infra-vm-ubuntu-noble
     gate:
       jobs:
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule
+        - kayobe-infra-vm-rocky10
+        - kayobe-infra-vm-rocky9
+        - kayobe-infra-vm-ubuntu-noble
+        - kayobe-overcloud-host-configure-rocky10
+        - kayobe-overcloud-host-configure-rocky9
+        - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-ubuntu-noble
         - kayobe-overcloud-ubuntu-noble-podman
-        - kayobe-overcloud-host-configure-rocky9
-        - kayobe-overcloud-host-configure-rocky10
-        - kayobe-overcloud-host-configure-ubuntu-noble
         - kayobe-overcloud-upgrade-ubuntu-noble
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-ubuntu-noble-podman
         - kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-vm-rocky10
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-noble
-        - kayobe-infra-vm-rocky9
-        - kayobe-infra-vm-ubuntu-noble
 
     experimental:
       jobs:
+        - kayobe-infra-vm-centos10s
+        - kayobe-infra-vm-centos10s-cloud-image
+        - kayobe-infra-vm-centos9s
         - kayobe-infra-vm-centos9s-cloud-image
+        - kayobe-infra-vm-rocky10-cloud-image
         - kayobe-infra-vm-rocky9-cloud-image
         - kayobe-infra-vm-ubuntu-noble-cloud-image
         - kayobe-overcloud-centos9s
-        - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-host-configure-centos10s
+        - kayobe-overcloud-host-configure-centos9s
         - kayobe-overcloud-rocky9
         - kayobe-overcloud-rocky9-podman
         - kayobe-overcloud-tls-rocky9
@@ -64,8 +72,14 @@
         - kayobe-seed-rocky9
         - kayobe-seed-rocky9-podman
         - kayobe-seed-upgrade-rocky9
+        - kayobe-seed-vm-centos10s
+        - kayobe-seed-vm-centos10s-cloud-image
+        - kayobe-seed-vm-centos10s-q35
+        - kayobe-seed-vm-centos9s
         - kayobe-seed-vm-centos9s-cloud-image
         - kayobe-seed-vm-centos9s-q35
+        - kayobe-seed-vm-rocky10-cloud-image
+        - kayobe-seed-vm-rocky10-q35
         - kayobe-seed-vm-rocky9-cloud-image
         - kayobe-seed-vm-rocky9-q35
         - kayobe-seed-vm-ubuntu-noble-cloud-image