Skip to content

Commit 4c1518a

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
[2025.1-only] Add support for Rocky Linux 10
Depends-On: https://review.opendev.org/c/openstack/kolla/+/967507 Change-Id: I651552cc2f84c2dd88270469b1538d8b4655932d Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 5cc0571 commit 4c1518a

File tree

9 files changed

+76
-4
lines changed

9 files changed

+76
-4
lines changed

ansible/roles/common/tasks/config.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@
2727
when:
2828
- kolla_copy_ca_into_containers | bool
2929

30+
- name: Ensure /var/log/journal exists on EL10 systems
31+
become: true
32+
file:
33+
path: /var/log/journal
34+
state: directory
35+
owner: root
36+
group: systemd-journal
37+
mode: "2755"
38+
when: >
39+
(kolla_base_distro == 'centos' and kolla_base_distro_version == 'stream10') or
40+
(kolla_base_distro == 'rocky' and kolla_base_distro_version == '10')
41+
3042
- name: Copying over /run subdirectories conf
3143
become: true
3244
template:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
{% 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' %}
12
{
2-
"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 }}",
3+
"command": "{{ remoted }} -l /var/log/kolla/hacluster/pacemaker-remoted.log{% if openstack_logging_debug | bool %} -VV{% endif %} -p {{ hacluster_pacemaker_remote_port }}",
34
"config_files": [
45
{
56
"source": "{{ container_config_directory }}/authkey",

ansible/roles/prechecks/vars/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ host_os_distributions:
1616
- "bookworm"
1717
Rocky:
1818
- "9"
19+
- "10"
1920
Ubuntu:
2021
- "noble"

doc/source/user/support-matrix.rst

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ Kolla Ansible supports the following host Operating Systems (OS):
99

1010
.. note::
1111

12-
CentOS Stream 9 is supported as a host OS while Kolla does not publish CS9
13-
based images. Users can build them on their own. We recommend using Rocky
14-
Linux 9 images instead.
12+
CentOS Stream 9 and 10 is supported as a host OS while Kolla does not
13+
publish CS9/10 based images. Users can build them on their own. We recommend
14+
using Rocky and 10 images instead.
1515

1616
* CentOS Stream 9
17+
* CentOS Stream 10
1718
* Debian Bookworm (12)
1819
* Rocky Linux 9
1920
* Ubuntu Noble (24.04)
@@ -29,5 +30,10 @@ OS distribution. The following values are supported for ``kolla_base_distro``:
2930
* ``rocky``
3031
* ``ubuntu``
3132

33+
.. note::
34+
35+
In order to use CentOS Stream 10 please set ``kolla_base_distro_version``
36+
to ``stream10`` and to ``10`` for using Rocky Linux 10.
37+
3238
For details of which images are supported on which distributions, see the
3339
:kolla-doc:`Kolla support matrix <support_matrix>`.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Adds ``Rocky Linux 10`` support alongside existing ``Rocky Linux 9`` to
5+
allow for operating system migrations before upgrading to 2025.2 (Flamingo)
6+
or 2026.1 (Gazpacho) which the former.

tests/templates/globals-default.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ virtualenv: "{{ kolla_runtime_venv_path }}"
1111
{% endif %}
1212

1313
kolla_base_distro: "{{ base_distro }}"
14+
{% if base_distro_version is defined %}
15+
kolla_base_distro_version: "{{ base_distro_version }}"
16+
{% endif %}
1417
network_interface: "{{ api_interface_name }}"
1518
network_address_family: "{{ address_family }}"
1619
kolla_container_engine: "{{ container_engine }}"

zuul.d/jobs.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
voting: false
1717
vars:
1818
base_distro: centos
19+
base_distro_version: stream10
1920
tls_enabled: true
2021
kolla_build_images: true
2122

@@ -73,6 +74,34 @@
7374
tls_enabled: true
7475
container_engine: podman
7576

77+
- job:
78+
name: kolla-ansible-rocky10
79+
parent: kolla-ansible-base
80+
nodeset: kolla-ansible-rocky10-8GB
81+
vars:
82+
base_distro: rocky
83+
base_distro_version: 10
84+
tls_enabled: true
85+
86+
- job:
87+
name: kolla-ansible-rocky10-podman
88+
parent: kolla-ansible-base
89+
nodeset: kolla-ansible-rocky10-8GB
90+
vars:
91+
base_distro: rocky
92+
base_distro_version: 10
93+
tls_enabled: true
94+
container_engine: podman
95+
96+
- job:
97+
name: kolla-ansible-rocky9-podman
98+
parent: kolla-ansible-base
99+
nodeset: kolla-ansible-rocky9
100+
vars:
101+
base_distro: rocky
102+
tls_enabled: true
103+
container_engine: podman
104+
76105
- job:
77106
name: kolla-ansible-ubuntu
78107
parent: kolla-ansible-base

zuul.d/nodesets.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,18 @@
6767
- name: primary
6868
label: rockylinux-9
6969

70+
- nodeset:
71+
name: kolla-ansible-rocky10-8GB
72+
nodes:
73+
- name: primary
74+
label: rockylinux-10-8GB
75+
76+
- nodeset:
77+
name: kolla-ansible-rocky-10-16GB
78+
nodes:
79+
- name: primary
80+
label: rockylinux-10-16GB
81+
7082
- nodeset:
7183
name: kolla-ansible-ubuntu-noble-multi-8GB
7284
nodes:

zuul.d/project.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
- kolla-ansible-debian-podman
2121
- kolla-ansible-rocky9
2222
- kolla-ansible-rocky9-podman
23+
- kolla-ansible-rocky10
24+
- kolla-ansible-rocky10-podman
2325
- kolla-ansible-ubuntu
2426
- kolla-ansible-ubuntu-podman
2527
- kolla-ansible-rocky9-kvm

0 commit comments

Comments
 (0)