Synchronise 2025.1 with upstream

ansible/roles/common/tasks/config.yml

@@ -27,6 +27,18 @@
   when:
     - kolla_copy_ca_into_containers | bool
 
+- name: Ensure /var/log/journal exists on EL10 systems
+  become: true
+  file:
+    path: /var/log/journal
+    state: directory
+    owner: root
+    group: systemd-journal
+    mode: "2755"
+  when: >
+    (kolla_base_distro == 'centos' and kolla_base_distro_version == 'stream10') or
+    (kolla_base_distro == 'rocky' and kolla_base_distro_version == '10')
+
 - name: Copying over /run subdirectories conf
   become: true
   template:

ansible/roles/hacluster/templates/hacluster-pacemaker-remote.json.j2

@@ -1,5 +1,6 @@
+{% set remoted = '/usr/sbin/pacemaker-remoted' if kolla_base_distro in ['centos', 'rocky'] and kolla_base_distro_version in ['10', 'stream10'] else '/usr/sbin/pacemaker_remoted' %}
 {
-    "command": "/usr/sbin/pacemaker_remoted -l /var/log/kolla/hacluster/pacemaker-remoted.log{% if openstack_logging_debug | bool %} -VV{% endif %} -p {{ hacluster_pacemaker_remote_port }}",
+    "command": "{{ remoted }} -l /var/log/kolla/hacluster/pacemaker-remoted.log{% if openstack_logging_debug | bool %} -VV{% endif %} -p {{ hacluster_pacemaker_remote_port }}",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/authkey",

ansible/roles/prechecks/vars/main.yml

@@ -11,9 +11,11 @@ ansible_version_max: '2.18'
 host_os_distributions:
   CentOS:
     - "9"
+    - "10"
   Debian:
     - "bookworm"
   Rocky:
     - "9"
+    - "10"
   Ubuntu:
     - "noble"

ansible/roles/prometheus/defaults/main.yml

@@ -121,6 +121,8 @@ prometheus_services:
     volumes: "{{ prometheus_elasticsearch_exporter_default_volumes + prometheus_elasticsearch_exporter_extra_volumes }}"
     dimensions: "{{ prometheus_elasticsearch_exporter_dimensions }}"
   prometheus-blackbox-exporter:
+    cap_add:
+      - CAP_NET_RAW
     container_name: "prometheus_blackbox_exporter"
     group: "prometheus-blackbox-exporter"
     enabled: "{{ enable_prometheus_blackbox_exporter | bool }}"

ansible/roles/prometheus/handlers/main.yml

@@ -112,6 +112,7 @@
   become: true
   kolla_container:
     action: "recreate_or_restart_container"
+    cap_add: "{{ service.cap_add }}"
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"

doc/source/user/support-matrix.rst

@@ -9,11 +9,12 @@ Kolla Ansible supports the following host Operating Systems (OS):
 
 .. note::
 
-   CentOS Stream 9 is supported as a host OS while Kolla does not publish CS9
-   based images. Users can build them on their own. We recommend using Rocky
-   Linux 9 images instead.
+   CentOS Stream 9 and 10 is supported as a host OS while Kolla does not
+   publish CS9/10 based images. Users can build them on their own. We recommend
+   using Rocky and 10 images instead.
 
 * CentOS Stream 9
+* CentOS Stream 10
 * Debian Bookworm (12)
 * Rocky Linux 9
 * Ubuntu Noble (24.04)
@@ -29,5 +30,10 @@ OS distribution. The following values are supported for ``kolla_base_distro``:
 * ``rocky``
 * ``ubuntu``
 
+.. note::
+
+   In order to use CentOS Stream 10 please set ``kolla_base_distro_version``
+   to ``stream10`` and to ``10`` for using Rocky Linux 10.
+
 For details of which images are supported on which distributions, see the
 :kolla-doc:`Kolla support matrix <support_matrix>`.

releasenotes/notes/rocky-10-epoxy-fb16bdfd71eefaab.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds ``Rocky Linux 10`` support alongside existing ``Rocky Linux 9`` to
+    allow for operating system migrations before upgrading to 2025.2 (Flamingo)
+    or 2026.1 (Gazpacho) which the former.

tests/templates/globals-default.j2

@@ -11,6 +11,9 @@ virtualenv: "{{ kolla_runtime_venv_path }}"
 {% endif %}
 
 kolla_base_distro: "{{ base_distro }}"
+{% if base_distro_version is defined %}
+kolla_base_distro_version: "{{ base_distro_version }}"
+{% endif %}
 network_interface: "{{ api_interface_name }}"
 network_address_family: "{{ address_family }}"
 kolla_container_engine: "{{ container_engine }}"

zuul.d/jobs.yaml

@@ -9,6 +9,17 @@
       tls_enabled: true
       kolla_build_images: true
 
+- job:
+    name: kolla-ansible-centos10s
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-centos10s
+    voting: false
+    vars:
+      base_distro: centos
+      base_distro_version: stream10
+      tls_enabled: true
+      kolla_build_images: true
+
 - job:
     name: kolla-ansible-debian-aarch64
     parent: kolla-ansible-debian
@@ -63,6 +74,34 @@
       tls_enabled: true
       container_engine: podman
 
+- job:
+    name: kolla-ansible-rocky10
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-rocky10-8GB
+    vars:
+      base_distro: rocky
+      base_distro_version: 10
+      tls_enabled: true
+
+- job:
+    name: kolla-ansible-rocky10-podman
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-rocky10-8GB
+    vars:
+      base_distro: rocky
+      base_distro_version: 10
+      tls_enabled: true
+      container_engine: podman
+
+- job:
+    name: kolla-ansible-rocky9-podman
+    parent: kolla-ansible-base
+    nodeset: kolla-ansible-rocky9
+    vars:
+      base_distro: rocky
+      tls_enabled: true
+      container_engine: podman
+
 - job:
     name: kolla-ansible-ubuntu
     parent: kolla-ansible-base

zuul.d/nodesets.yaml

@@ -6,10 +6,16 @@
         label: centos-9-stream
 
 - nodeset:
-    name: kolla-ansible-debian-bookworm-8GB
+    name: kolla-ansible-centos10s
     nodes:
       - name: primary
-        label: debian-bookworm-8GB
+        label: centos-10-stream-8GB
+
+- nodeset:
+    name: kolla-ansible-debian-bookworm
+    nodes:
+      - name: primary
+        label: debian-bookworm
 
 - nodeset:
     name: kolla-ansible-debian-bookworm-16GB
@@ -61,6 +67,18 @@
       - name: primary
         label: rockylinux-9
 
+- nodeset:
+    name: kolla-ansible-rocky10-8GB
+    nodes:
+      - name: primary
+        label: rockylinux-10-8GB
+
+- nodeset:
+    name: kolla-ansible-rocky-10-16GB
+    nodes:
+      - name: primary
+        label: rockylinux-10-16GB
+
 - nodeset:
     name: kolla-ansible-ubuntu-noble-multi-8GB
     nodes:

zuul.d/project.yaml

@@ -15,10 +15,13 @@
         - openstack-tox-py311
         - openstack-tox-py312
         - kolla-ansible-centos9s
+        - kolla-ansible-centos10s
         - kolla-ansible-debian
         - kolla-ansible-debian-podman
         - kolla-ansible-rocky9
         - kolla-ansible-rocky9-podman
+        - kolla-ansible-rocky10
+        - kolla-ansible-rocky10-podman
         - kolla-ansible-ubuntu
         - kolla-ansible-ubuntu-podman
         - kolla-ansible-rocky9-kvm