Move to for Rocky Linux 10

CephAdm, Octavia, OVN and NFV jobs are not added here, because these rely on
Valkey/Redis available.
Ironic jobs are not added, because ipxe.efi is not packaged in EL10 and needs
a followup patch.
Let's Encrypt jobs are also not added, due to ssl certificate validation
errors.

Depends-On: https://review.opendev.org/c/openstack/kolla/+/956554
Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/961237

Change-Id: I51823808c4e4ac08ae8f080aacf6a3759589571d
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This commit is contained in:
Michal Nasiadka
2025-08-05 14:56:10 +02:00
committed by Bartosz Bezak
parent 2370ea60c8
commit 5587c1b786
25 changed files with 169 additions and 17 deletions

View File

@@ -214,9 +214,9 @@ kolla_container_engine: "docker"
# Internal Image options # Internal Image options
######################### #########################
kolla_base_distro_version_default_map: { kolla_base_distro_version_default_map: {
"centos": "stream9", "centos": "stream10",
"debian": "bookworm", "debian": "bookworm",
"rocky": "9", "rocky": "10",
"ubuntu": "noble", "ubuntu": "noble",
} }

View File

@@ -16,6 +16,16 @@
when: when:
- kolla_copy_ca_into_containers | bool - kolla_copy_ca_into_containers | bool
- name: Ensure /var/log/journal exists on EL systems
become: true
file:
path: /var/log/journal
state: directory
owner: root
group: systemd-journal
mode: "2755"
when: kolla_base_distro in ['centos', 'rocky']
- name: Copying over config.json files for services - name: Copying over config.json files for services
template: template:
src: "{{ item.key }}.json.j2" src: "{{ item.key }}.json.j2"

View File

@@ -1,5 +1,6 @@
{% set remoted = '/usr/sbin/pacemaker-remoted' if kolla_base_distro in ['centos', 'rocky'] 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": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/authkey", "source": "{{ container_config_directory }}/authkey",

View File

@@ -14,6 +14,6 @@ host_os_distributions:
Debian: Debian:
- "bookworm" - "bookworm"
Rocky: Rocky:
- "9" - "10"
Ubuntu: Ubuntu:
- "noble" - "noble"

View File

@@ -83,7 +83,7 @@ following options on the first database node:
docker run --rm -it --volumes-from mariadb --name dbrestore \ docker run --rm -it --volumes-from mariadb --name dbrestore \
--volume mariadb_backup:/backup \ --volume mariadb_backup:/backup \
quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \ quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-10 \
/bin/bash /bin/bash
(dbrestore) $ cd /backup (dbrestore) $ cd /backup
(dbrestore) $ rm -rf /backup/restore (dbrestore) $ rm -rf /backup/restore
@@ -105,7 +105,7 @@ place, again on the first node:
docker run --rm -it --volumes-from mariadb --name dbrestore \ docker run --rm -it --volumes-from mariadb --name dbrestore \
--volume mariadb_backup:/backup \ --volume mariadb_backup:/backup \
quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \ quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-10 \
/bin/bash /bin/bash
(dbrestore) $ rm -rf /var/lib/mysql/* (dbrestore) $ rm -rf /var/lib/mysql/*
(dbrestore) $ rm -rf /var/lib/mysql/\.[^\.]* (dbrestore) $ rm -rf /var/lib/mysql/\.[^\.]*
@@ -148,7 +148,7 @@ incremental backup,
docker run --rm -it --volumes-from mariadb --name dbrestore \ docker run --rm -it --volumes-from mariadb --name dbrestore \
--volume mariadb_backup:/backup --tmpfs /backup/restore \ --volume mariadb_backup:/backup --tmpfs /backup/restore \
quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-9 \ quay.io/openstack.kolla/mariadb-server:|KOLLA_OPENSTACK_RELEASE|-rocky-10 \
/bin/bash /bin/bash
(dbrestore) $ cd /backup (dbrestore) $ cd /backup
(dbrestore) $ rm -rf /backup/restore (dbrestore) $ rm -rf /backup/restore

View File

@@ -340,7 +340,7 @@ Now deploy Octavia:
Amphora image Amphora image
------------- -------------
It is necessary to build an Amphora image. On CentOS / Rocky 9: It is necessary to build an Amphora image. On CentOS / Rocky 10:
.. code-block:: console .. code-block:: console

View File

@@ -186,7 +186,7 @@ There are a few options that are required to deploy Kolla Ansible:
- Rocky (``rocky``) - Rocky (``rocky``)
- Ubuntu (``ubuntu``) - Ubuntu (``ubuntu``)
For newcomers, we recommend to use Rocky Linux 9 or Ubuntu 24.04. For newcomers, we recommend to use Rocky Linux 10 or Ubuntu 24.04.
.. code-block:: console .. code-block:: console

View File

@@ -177,7 +177,7 @@ There are a few options that are required to deploy Kolla Ansible:
- Rocky (``rocky``) - Rocky (``rocky``)
- Ubuntu (``ubuntu``) - Ubuntu (``ubuntu``)
For newcomers, we recommend to use Rocky Linux 9 or Ubuntu 24.04. For newcomers, we recommend to use Rocky Linux 10 or Ubuntu 24.04.
.. code-block:: console .. code-block:: console

View File

@@ -9,13 +9,13 @@ Kolla Ansible supports the following host Operating Systems (OS):
.. note:: .. note::
CentOS Stream 9 is supported as a host OS while Kolla does not publish CS9 CentOS Stream 10 is supported as a host OS while Kolla does not publish CS10
based images. Users can build them on their own. We recommend using Rocky based images. Users can build them on their own. We recommend using Rocky
Linux 9 images instead. Linux 10 images instead.
* CentOS Stream 9 * CentOS Stream 10
* Debian Bookworm (12) * Debian Bookworm (12)
* Rocky Linux 9 * Rocky Linux 10
* Ubuntu Noble (24.04) * Ubuntu Noble (24.04)
Supported container images Supported container images

View File

@@ -1,5 +1,5 @@
--- ---
cephadm_ceph_release: "reef" cephadm_ceph_release: "squid"
cephadm_ceph_apt_repo: "deb http://download.ceph.com/debian-{{ cephadm_ceph_release }}/ {{ ansible_distribution_release }} main" cephadm_ceph_apt_repo: "deb http://download.ceph.com/debian-{{ cephadm_ceph_release }}/ {{ ansible_distribution_release }} main"
cephadm_use_package_from_distribution: false cephadm_use_package_from_distribution: false

View File

@@ -22,8 +22,11 @@
become: True become: True
when: not cephadm_use_package_from_distribution when: not cephadm_use_package_from_distribution
- name: Install cephadm # NOTE(mnasiadka): cephadm bootstrap failing on jinja2 missing
- name: Install cephadm and jinja2
dnf: dnf:
name: "cephadm" name:
- cephadm
- python3-jinja2
install_weak_deps: False install_weak_deps: False
become: True become: True

View File

@@ -67,6 +67,50 @@
- name: primary - name: primary
label: debian-bookworm-nested-virt-8GB label: debian-bookworm-nested-virt-8GB
- nodeset:
name: kolla-ansible-rocky-10-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-rocky-10-masakari-8GB
nodes:
- name: primary
label: rockylinux-10-8GB
- name: secondary
label: rockylinux-10-8GB
- name: ternary1
label: rockylinux-10-8GB
- name: ternary2
label: rockylinux-10-8GB
- nodeset:
name: kolla-ansible-rocky-10-multi-8GB
nodes:
- name: primary
label: rockylinux-10-8GB
- name: secondary1
label: rockylinux-10-8GB
- name: secondary2
label: rockylinux-10-8GB
- nodeset:
name: kolla-ansible-rocky-10-multi-16GB
nodes:
- name: primary
label: rockylinux-10-16GB
- name: secondary1
label: rockylinux-10-16GB
- name: secondary2
label: rockylinux-10-16GB
- nodeset: - nodeset:
name: kolla-ansible-ubuntu-noble-8GB name: kolla-ansible-ubuntu-noble-8GB
nodes: nodes:

View File

@@ -61,6 +61,18 @@
nodeset: kolla-ansible-debian-bookworm-16GB nodeset: kolla-ansible-debian-bookworm-16GB
timeout: 9000 timeout: 9000
- job:
name: kolla-ansible-rocky-10
parent: kolla-ansible-base
nodeset: kolla-ansible-rocky-10-16GB
- job:
name: kolla-ansible-rocky-10-podman
parent: kolla-ansible-rocky-10
nodeset: kolla-ansible-rocky-10-16GB
vars:
container_engine: podman
- job: - job:
name: kolla-ansible-ubuntu-noble name: kolla-ansible-ubuntu-noble
parent: kolla-ansible-base parent: kolla-ansible-base
@@ -95,6 +107,8 @@
- kolla-ansible-debian-bookworm - kolla-ansible-debian-bookworm
- kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-podman
- kolla-ansible-debian-bookworm-upgrade - kolla-ansible-debian-bookworm-upgrade
- kolla-ansible-rocky-10
- kolla-ansible-rocky-10-podman
- kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble
- kolla-ansible-ubuntu-noble-podman - kolla-ansible-ubuntu-noble-podman
- kolla-ansible-ubuntu-noble-upgrade - kolla-ansible-ubuntu-noble-upgrade
@@ -109,6 +123,8 @@
- kolla-ansible-debian-bookworm - kolla-ansible-debian-bookworm
- kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-podman
- kolla-ansible-debian-bookworm-upgrade - kolla-ansible-debian-bookworm-upgrade
- kolla-ansible-rocky-10
- kolla-ansible-rocky-10-podman
- kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble
- kolla-ansible-ubuntu-noble-upgrade - kolla-ansible-ubuntu-noble-upgrade
- kolla-ansible-ubuntu-noble-podman - kolla-ansible-ubuntu-noble-podman

View File

@@ -16,6 +16,11 @@
parent: kolla-ansible-bifrost-base parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-bifrost
parent: kolla-ansible-bifrost-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-bifrost name: kolla-ansible-ubuntu-noble-bifrost
parent: kolla-ansible-bifrost-base parent: kolla-ansible-bifrost-base
@@ -28,4 +33,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-bifrost - kolla-ansible-debian-bookworm-bifrost
- kolla-ansible-rocky-10-bifrost
- kolla-ansible-ubuntu-noble-bifrost - kolla-ansible-ubuntu-noble-bifrost

View File

@@ -19,6 +19,11 @@
parent: kolla-ansible-cells-base parent: kolla-ansible-cells-base
nodeset: kolla-ansible-debian-bookworm-multi-16GB nodeset: kolla-ansible-debian-bookworm-multi-16GB
- job:
name: kolla-ansible-rocky-10-cells
parent: kolla-ansible-cells-base
nodeset: kolla-ansible-rocky-10-multi-16GB
- job: - job:
name: kolla-ansible-ubuntu-noble-cells name: kolla-ansible-ubuntu-noble-cells
parent: kolla-ansible-cells-base parent: kolla-ansible-cells-base
@@ -31,4 +36,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-cells - kolla-ansible-debian-bookworm-cells
- kolla-ansible-rocky-10-cells
- kolla-ansible-ubuntu-noble-cells - kolla-ansible-ubuntu-noble-cells

View File

@@ -19,6 +19,11 @@
parent: kolla-ansible-haproxy-fqdn-base parent: kolla-ansible-haproxy-fqdn-base
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-haproxy-fqdn
parent: kolla-ansible-haproxy-fqdn-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-haproxy-fqdn name: kolla-ansible-ubuntu-noble-haproxy-fqdn
parent: kolla-ansible-haproxy-fqdn-base parent: kolla-ansible-haproxy-fqdn-base
@@ -31,4 +36,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-haproxy-fqdn - kolla-ansible-debian-bookworm-haproxy-fqdn
- kolla-ansible-rocky-10-haproxy-fqdn
- kolla-ansible-ubuntu-noble-haproxy-fqdn - kolla-ansible-ubuntu-noble-haproxy-fqdn

View File

@@ -20,6 +20,11 @@
parent: kolla-ansible-hashi-vault-base parent: kolla-ansible-hashi-vault-base
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-hashi-vault
parent: kolla-ansible-hashi-vault-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-hashi-vault name: kolla-ansible-ubuntu-noble-hashi-vault
parent: kolla-ansible-hashi-vault-base parent: kolla-ansible-hashi-vault-base
@@ -32,4 +37,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-hashi-vault - kolla-ansible-debian-bookworm-hashi-vault
- kolla-ansible-rocky-10-hashi-vault
- kolla-ansible-ubuntu-noble-hashi-vault - kolla-ansible-ubuntu-noble-hashi-vault

View File

@@ -23,6 +23,11 @@
parent: kolla-ansible-ipv6-base parent: kolla-ansible-ipv6-base
nodeset: kolla-ansible-debian-bookworm-multi-8GB nodeset: kolla-ansible-debian-bookworm-multi-8GB
- job:
name: kolla-ansible-rocky-10-ipv6
parent: kolla-ansible-ipv6-base
nodeset: kolla-ansible-rocky-10-multi-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-ipv6 name: kolla-ansible-ubuntu-noble-ipv6
parent: kolla-ansible-ipv6-base parent: kolla-ansible-ipv6-base
@@ -35,4 +40,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-ipv6 - kolla-ansible-debian-bookworm-ipv6
- kolla-ansible-rocky-10-ipv6
- kolla-ansible-ubuntu-noble-ipv6 - kolla-ansible-ubuntu-noble-ipv6

View File

@@ -14,6 +14,11 @@
parent: kolla-ansible-kvm-base parent: kolla-ansible-kvm-base
nodeset: kolla-ansible-debian-bookworm-nested-virt nodeset: kolla-ansible-debian-bookworm-nested-virt
- job:
name: kolla-ansible-rocky-10-kvm
parent: kolla-ansible-kvm-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-kvm name: kolla-ansible-ubuntu-noble-kvm
parent: kolla-ansible-kvm-base parent: kolla-ansible-kvm-base
@@ -26,4 +31,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-kvm - kolla-ansible-debian-bookworm-kvm
- kolla-ansible-rocky-10-kvm
- kolla-ansible-ubuntu-noble-kvm - kolla-ansible-ubuntu-noble-kvm

View File

@@ -21,6 +21,11 @@
parent: kolla-ansible-magnum-base parent: kolla-ansible-magnum-base
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-magnum
parent: kolla-ansible-magnum-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-magnum name: kolla-ansible-ubuntu-noble-magnum
parent: kolla-ansible-magnum-base parent: kolla-ansible-magnum-base
@@ -33,4 +38,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-magnum - kolla-ansible-debian-bookworm-magnum
- kolla-ansible-rocky-10-magnum
- kolla-ansible-ubuntu-noble-magnum - kolla-ansible-ubuntu-noble-magnum

View File

@@ -22,6 +22,11 @@
parent: kolla-ansible-mariadb-base parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-debian-bookworm-multi-16GB nodeset: kolla-ansible-debian-bookworm-multi-16GB
- job:
name: kolla-ansible-rocky-10-mariadb
parent: kolla-ansible-mariadb-base
nodeset: kolla-ansible-rocky-10-multi-16GB
- job: - job:
name: kolla-ansible-ubuntu-noble-mariadb name: kolla-ansible-ubuntu-noble-mariadb
parent: kolla-ansible-mariadb-base parent: kolla-ansible-mariadb-base
@@ -34,6 +39,7 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-mariadb - kolla-ansible-debian-bookworm-mariadb
- kolla-ansible-rocky-10-mariadb
- kolla-ansible-ubuntu-noble-mariadb - kolla-ansible-ubuntu-noble-mariadb
gate: gate:
jobs: jobs:

View File

@@ -21,6 +21,11 @@
parent: kolla-ansible-masakari-base parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-debian-bookworm-masakari-8GB nodeset: kolla-ansible-debian-bookworm-masakari-8GB
- job:
name: kolla-ansible-rocky-10-masakari
parent: kolla-ansible-masakari-base
nodeset: kolla-ansible-rocky-10-masakari-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-masakari name: kolla-ansible-ubuntu-noble-masakari
parent: kolla-ansible-masakari-base parent: kolla-ansible-masakari-base
@@ -33,4 +38,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-masakari - kolla-ansible-debian-bookworm-masakari
- kolla-ansible-rocky-10-masakari
- kolla-ansible-ubuntu-noble-masakari - kolla-ansible-ubuntu-noble-masakari

View File

@@ -33,6 +33,11 @@
parent: kolla-ansible-debian-bookworm-prometheus-opensearch parent: kolla-ansible-debian-bookworm-prometheus-opensearch
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-prometheus-opensearch
parent: kolla-ansible-prometheus-opensearch-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-prometheus-opensearch name: kolla-ansible-ubuntu-noble-prometheus-opensearch
parent: kolla-ansible-prometheus-opensearch-base parent: kolla-ansible-prometheus-opensearch-base
@@ -51,5 +56,6 @@
jobs: jobs:
- kolla-ansible-debian-bookworm-prometheus-opensearch - kolla-ansible-debian-bookworm-prometheus-opensearch
- kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade - kolla-ansible-debian-bookworm-prometheus-opensearch-upgrade
- kolla-ansible-rocky-10-prometheus-opensearch
- kolla-ansible-ubuntu-noble-prometheus-opensearch - kolla-ansible-ubuntu-noble-prometheus-opensearch
- kolla-ansible-ubuntu-noble-prometheus-opensearch-upgrade - kolla-ansible-ubuntu-noble-prometheus-opensearch-upgrade

View File

@@ -29,6 +29,16 @@
parent: kolla-ansible-skyline-sso-base parent: kolla-ansible-skyline-sso-base
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-skyline
parent: kolla-ansible-skyline-base
nodeset: kolla-ansible-rocky-10-8GB
- job:
name: kolla-ansible-rocky-10-skyline-sso
parent: kolla-ansible-skyline-sso-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-skyline name: kolla-ansible-ubuntu-noble-skyline
parent: kolla-ansible-skyline-base parent: kolla-ansible-skyline-base
@@ -47,5 +57,7 @@
jobs: jobs:
- kolla-ansible-debian-bookworm-skyline - kolla-ansible-debian-bookworm-skyline
- kolla-ansible-debian-bookworm-skyline-sso - kolla-ansible-debian-bookworm-skyline-sso
- kolla-ansible-rocky-10-skyline
- kolla-ansible-rocky-10-skyline-sso
- kolla-ansible-ubuntu-noble-skyline - kolla-ansible-ubuntu-noble-skyline
- kolla-ansible-ubuntu-noble-skyline-sso - kolla-ansible-ubuntu-noble-skyline-sso

View File

@@ -18,6 +18,11 @@
parent: kolla-ansible-telemetry-base parent: kolla-ansible-telemetry-base
nodeset: kolla-ansible-debian-bookworm-8GB nodeset: kolla-ansible-debian-bookworm-8GB
- job:
name: kolla-ansible-rocky-10-telemetry
parent: kolla-ansible-telemetry-base
nodeset: kolla-ansible-rocky-10-8GB
- job: - job:
name: kolla-ansible-ubuntu-noble-telemetry name: kolla-ansible-ubuntu-noble-telemetry
parent: kolla-ansible-telemetry-base parent: kolla-ansible-telemetry-base
@@ -30,4 +35,5 @@
check: check:
jobs: jobs:
- kolla-ansible-debian-bookworm-telemetry - kolla-ansible-debian-bookworm-telemetry
- kolla-ansible-rocky-10-telemetry
- kolla-ansible-ubuntu-noble-telemetry - kolla-ansible-ubuntu-noble-telemetry