Merge pull request #482 from stackhpc/upstream/master-2025-10-06

Synchronise master with upstream

Author: priteau

ansible/infra-vm-provision.yml

@@ -44,5 +44,5 @@
         state: started
         # NOTE: Ensure we exceed the 5 minute DHCP timeout of the eth0
         # interface if necessary.
-        timeout: 360
+        timeout: "{{ infra_vm_provision_timeout | default(360) | int }}"
       delegate_to: localhost

ansible/inventory/group_vars/all/compute

@@ -240,8 +240,8 @@ compute_libvirt_enable_tls: false
 compute_libvirt_ceph_repo_install: true
 
 # Ceph package repository release to install on CentOS and Rocky hosts when
-# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
-compute_libvirt_ceph_repo_release: pacific
+# compute_libvirt_ceph_repo_install is true. Default is 'squid'.
+compute_libvirt_ceph_repo_release: squid
 
 ###############################################################################
 # Compute node swap configuration.

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
-# "9" when os_distribution is "rocky", or "noble" when os_distribution is
-# "ubuntu".
+# OS release. Valid options are "9-stream" and "10-stream" (with "9-stream"
+# being the default) when os_distribution is "centos", "9" and "10" (with "9"
+# 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
-# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
-# when os_distribution is "rocky",
-# or
+# when os_distribution is "ubuntu",
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "9",
+# "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
-# when os_distribution is "rocky",
-# or
+# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
+# when os_distribution is "rocky" and os_release is "9",
+# "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-devel
+  - "{{ 'python3.12' if ansible_facts.distribution_major_version == '9' else 'python3' }}"
+  - "{{ 'python3.12-devel' if ansible_facts.distribution_major_version == '9' else 'python3-devel' }}"
   - rsync

ansible/seed-vm-provision.yml

@@ -131,4 +131,4 @@
         state: started
         # NOTE: Ensure we exceed the 5 minute DHCP timeout of the eth0
         # interface if necessary.
-        timeout: 360
+        timeout: "{{ seed_vm_provision_timeout | default(360) | int }}"

ansible/tuned.yml

@@ -13,4 +13,3 @@
       become: true
       when:
         - tuned_active_builtin_profile != ""
-        - ansible_facts.os_family == 'RedHat'

doc/source/configuration/reference/hosts.rst

@@ -690,8 +690,6 @@ Tuned
 *tags:*
   | ``tuned``
 
-.. note:: Tuned configuration only supports CentOS/Rocky systems for now.
-
 Built-in ``tuned`` profiles can be applied to hosts. The following variables
 can be used to set a ``tuned`` profile to specific types of hosts:
 
@@ -1240,7 +1238,7 @@ are relevant only when using the libvirt daemon rather than the
     Default is ``true``.
 ``compute_libvirt_ceph_repo_release``
     Ceph package repository release to install on CentOS and Rocky hosts when
-    ``compute_libvirt_ceph_repo_install`` is ``true``. Default is ``pacific``.
+    ``compute_libvirt_ceph_repo_install`` is ``true``. Default is ``squid``.
 
 Example: custom libvirtd.conf
 -----------------------------

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 ``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``, and this
-is its default value.
+set to ``9-stream`` or ``10-stream``, and ``9-stream`` is its default value.
+When ``os_distribution`` is set to ``rocky`` it may be set to ``9`` or ``10``,
+and ``9`` is its default value.  When ``os_distribution`` is set to ``ubuntu``
+it may be set to ``noble``, and this is its default value.
 
 These variables are used to set various defaults, including: