diff --git a/ansible/group_vars/all/common.yml b/ansible/group_vars/all/common.yml index a08a3ce3c1..82d670f48b 100644 --- a/ansible/group_vars/all/common.yml +++ b/ansible/group_vars/all/common.yml @@ -214,9 +214,9 @@ kolla_container_engine: "docker" # Internal Image options ######################### kolla_base_distro_version_default_map: { - "centos": "stream9", + "centos": "stream10", "debian": "bookworm", - "rocky": "9", + "rocky": "10", "ubuntu": "noble", } diff --git a/ansible/roles/fluentd/tasks/config.yml b/ansible/roles/fluentd/tasks/config.yml index d1fc3ac338..83a5504f3f 100644 --- a/ansible/roles/fluentd/tasks/config.yml +++ b/ansible/roles/fluentd/tasks/config.yml @@ -16,6 +16,16 @@ when: - 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 template: src: "{{ item.key }}.json.j2" diff --git a/ansible/roles/hacluster/templates/hacluster-pacemaker-remote.json.j2 b/ansible/roles/hacluster/templates/hacluster-pacemaker-remote.json.j2 index e84923d67d..4cc1568849 100644 --- a/ansible/roles/hacluster/templates/hacluster-pacemaker-remote.json.j2 +++ b/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'] 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", diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 6b65e8bfcd..7cb1fe28e1 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -14,6 +14,6 @@ host_os_distributions: Debian: - "bookworm" Rocky: - - "9" + - "10" Ubuntu: - "noble" diff --git a/doc/source/admin/mariadb-backup-and-restore.rst b/doc/source/admin/mariadb-backup-and-restore.rst index 6ebb73d5b5..69fd411fd4 100644 --- a/doc/source/admin/mariadb-backup-and-restore.rst +++ b/doc/source/admin/mariadb-backup-and-restore.rst @@ -83,7 +83,7 @@ following options on the first database node: docker run --rm -it --volumes-from mariadb --name dbrestore \ --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 (dbrestore) $ cd /backup (dbrestore) $ rm -rf /backup/restore @@ -105,7 +105,7 @@ place, again on the first node: docker run --rm -it --volumes-from mariadb --name dbrestore \ --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 (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 \ --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 (dbrestore) $ cd /backup (dbrestore) $ rm -rf /backup/restore diff --git a/doc/source/reference/networking/octavia.rst b/doc/source/reference/networking/octavia.rst index af08cf9e04..7a29d67fa8 100644 --- a/doc/source/reference/networking/octavia.rst +++ b/doc/source/reference/networking/octavia.rst @@ -340,7 +340,7 @@ Now deploy Octavia: 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 diff --git a/doc/source/user/quickstart-development.rst b/doc/source/user/quickstart-development.rst index 0dccdb1f18..6e29a2ad51 100644 --- a/doc/source/user/quickstart-development.rst +++ b/doc/source/user/quickstart-development.rst @@ -186,7 +186,7 @@ There are a few options that are required to deploy Kolla Ansible: - Rocky (``rocky``) - 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 diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index 4afcab38aa..b4d8553670 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -177,7 +177,7 @@ There are a few options that are required to deploy Kolla Ansible: - Rocky (``rocky``) - 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 diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 0301775f19..8925a2c021 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -9,13 +9,13 @@ 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 + 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 - Linux 9 images instead. + Linux 10 images instead. -* CentOS Stream 9 +* CentOS Stream 10 * Debian Bookworm (12) -* Rocky Linux 9 +* Rocky Linux 10 * Ubuntu Noble (24.04) Supported container images diff --git a/roles/cephadm/defaults/main.yml b/roles/cephadm/defaults/main.yml index 6739d491ce..5ab4c04257 100644 --- a/roles/cephadm/defaults/main.yml +++ b/roles/cephadm/defaults/main.yml @@ -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_use_package_from_distribution: false diff --git a/roles/cephadm/tasks/pkg_redhat.yml b/roles/cephadm/tasks/pkg_redhat.yml index 85708cef43..af8c747b83 100644 --- a/roles/cephadm/tasks/pkg_redhat.yml +++ b/roles/cephadm/tasks/pkg_redhat.yml @@ -22,8 +22,11 @@ become: True when: not cephadm_use_package_from_distribution -- name: Install cephadm +# NOTE(mnasiadka): cephadm bootstrap failing on jinja2 missing +- name: Install cephadm and jinja2 dnf: - name: "cephadm" + name: + - cephadm + - python3-jinja2 install_weak_deps: False become: True diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index a28552933d..295df62e61 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -67,6 +67,50 @@ - name: primary 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: name: kolla-ansible-ubuntu-noble-8GB nodes: diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 5b43461b27..7a624359a1 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -61,6 +61,18 @@ nodeset: kolla-ansible-debian-bookworm-16GB 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: name: kolla-ansible-ubuntu-noble parent: kolla-ansible-base @@ -95,6 +107,8 @@ - kolla-ansible-debian-bookworm - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade + - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-podman - kolla-ansible-ubuntu-noble-upgrade @@ -109,6 +123,8 @@ - kolla-ansible-debian-bookworm - kolla-ansible-debian-bookworm-podman - kolla-ansible-debian-bookworm-upgrade + - kolla-ansible-rocky-10 + - kolla-ansible-rocky-10-podman - kolla-ansible-ubuntu-noble - kolla-ansible-ubuntu-noble-upgrade - kolla-ansible-ubuntu-noble-podman diff --git a/zuul.d/scenarios/bifrost.yaml b/zuul.d/scenarios/bifrost.yaml index 9c6690052a..d4fa31204d 100644 --- a/zuul.d/scenarios/bifrost.yaml +++ b/zuul.d/scenarios/bifrost.yaml @@ -16,6 +16,11 @@ parent: kolla-ansible-bifrost-base 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: name: kolla-ansible-ubuntu-noble-bifrost parent: kolla-ansible-bifrost-base @@ -28,4 +33,5 @@ check: jobs: - kolla-ansible-debian-bookworm-bifrost + - kolla-ansible-rocky-10-bifrost - kolla-ansible-ubuntu-noble-bifrost diff --git a/zuul.d/scenarios/cells.yaml b/zuul.d/scenarios/cells.yaml index ce061af6b6..5b546bc8e4 100644 --- a/zuul.d/scenarios/cells.yaml +++ b/zuul.d/scenarios/cells.yaml @@ -19,6 +19,11 @@ parent: kolla-ansible-cells-base 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: name: kolla-ansible-ubuntu-noble-cells parent: kolla-ansible-cells-base @@ -31,4 +36,5 @@ check: jobs: - kolla-ansible-debian-bookworm-cells + - kolla-ansible-rocky-10-cells - kolla-ansible-ubuntu-noble-cells diff --git a/zuul.d/scenarios/haproxy-fqdn.yaml b/zuul.d/scenarios/haproxy-fqdn.yaml index 672d7a8b5b..a668696a14 100644 --- a/zuul.d/scenarios/haproxy-fqdn.yaml +++ b/zuul.d/scenarios/haproxy-fqdn.yaml @@ -19,6 +19,11 @@ parent: kolla-ansible-haproxy-fqdn-base 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: name: kolla-ansible-ubuntu-noble-haproxy-fqdn parent: kolla-ansible-haproxy-fqdn-base @@ -31,4 +36,5 @@ check: jobs: - kolla-ansible-debian-bookworm-haproxy-fqdn + - kolla-ansible-rocky-10-haproxy-fqdn - kolla-ansible-ubuntu-noble-haproxy-fqdn diff --git a/zuul.d/scenarios/hashi-vault.yaml b/zuul.d/scenarios/hashi-vault.yaml index 74c92c4454..429285ffd8 100644 --- a/zuul.d/scenarios/hashi-vault.yaml +++ b/zuul.d/scenarios/hashi-vault.yaml @@ -20,6 +20,11 @@ parent: kolla-ansible-hashi-vault-base 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: name: kolla-ansible-ubuntu-noble-hashi-vault parent: kolla-ansible-hashi-vault-base @@ -32,4 +37,5 @@ check: jobs: - kolla-ansible-debian-bookworm-hashi-vault + - kolla-ansible-rocky-10-hashi-vault - kolla-ansible-ubuntu-noble-hashi-vault diff --git a/zuul.d/scenarios/ipv6.yaml b/zuul.d/scenarios/ipv6.yaml index e45bf0cd6b..186b4cc85b 100644 --- a/zuul.d/scenarios/ipv6.yaml +++ b/zuul.d/scenarios/ipv6.yaml @@ -23,6 +23,11 @@ parent: kolla-ansible-ipv6-base 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: name: kolla-ansible-ubuntu-noble-ipv6 parent: kolla-ansible-ipv6-base @@ -35,4 +40,5 @@ check: jobs: - kolla-ansible-debian-bookworm-ipv6 + - kolla-ansible-rocky-10-ipv6 - kolla-ansible-ubuntu-noble-ipv6 diff --git a/zuul.d/scenarios/kvm.yaml b/zuul.d/scenarios/kvm.yaml index 829021ad3b..a78b927d40 100644 --- a/zuul.d/scenarios/kvm.yaml +++ b/zuul.d/scenarios/kvm.yaml @@ -14,6 +14,11 @@ parent: kolla-ansible-kvm-base 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: name: kolla-ansible-ubuntu-noble-kvm parent: kolla-ansible-kvm-base @@ -26,4 +31,5 @@ check: jobs: - kolla-ansible-debian-bookworm-kvm + - kolla-ansible-rocky-10-kvm - kolla-ansible-ubuntu-noble-kvm diff --git a/zuul.d/scenarios/magnum.yaml b/zuul.d/scenarios/magnum.yaml index cd19d79a05..fb0e08b2ff 100644 --- a/zuul.d/scenarios/magnum.yaml +++ b/zuul.d/scenarios/magnum.yaml @@ -21,6 +21,11 @@ parent: kolla-ansible-magnum-base 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: name: kolla-ansible-ubuntu-noble-magnum parent: kolla-ansible-magnum-base @@ -33,4 +38,5 @@ check: jobs: - kolla-ansible-debian-bookworm-magnum + - kolla-ansible-rocky-10-magnum - kolla-ansible-ubuntu-noble-magnum diff --git a/zuul.d/scenarios/mariadb.yaml b/zuul.d/scenarios/mariadb.yaml index 776a9999cc..59be953964 100644 --- a/zuul.d/scenarios/mariadb.yaml +++ b/zuul.d/scenarios/mariadb.yaml @@ -22,6 +22,11 @@ parent: kolla-ansible-mariadb-base 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: name: kolla-ansible-ubuntu-noble-mariadb parent: kolla-ansible-mariadb-base @@ -34,6 +39,7 @@ check: jobs: - kolla-ansible-debian-bookworm-mariadb + - kolla-ansible-rocky-10-mariadb - kolla-ansible-ubuntu-noble-mariadb gate: jobs: diff --git a/zuul.d/scenarios/masakari.yaml b/zuul.d/scenarios/masakari.yaml index ed6182b8b2..11a5955c22 100644 --- a/zuul.d/scenarios/masakari.yaml +++ b/zuul.d/scenarios/masakari.yaml @@ -21,6 +21,11 @@ parent: kolla-ansible-masakari-base 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: name: kolla-ansible-ubuntu-noble-masakari parent: kolla-ansible-masakari-base @@ -33,4 +38,5 @@ check: jobs: - kolla-ansible-debian-bookworm-masakari + - kolla-ansible-rocky-10-masakari - kolla-ansible-ubuntu-noble-masakari diff --git a/zuul.d/scenarios/prometheus-opensearch.yaml b/zuul.d/scenarios/prometheus-opensearch.yaml index 9cd9938496..463e54d6df 100644 --- a/zuul.d/scenarios/prometheus-opensearch.yaml +++ b/zuul.d/scenarios/prometheus-opensearch.yaml @@ -33,6 +33,11 @@ parent: kolla-ansible-debian-bookworm-prometheus-opensearch 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: name: kolla-ansible-ubuntu-noble-prometheus-opensearch parent: kolla-ansible-prometheus-opensearch-base @@ -51,5 +56,6 @@ jobs: - kolla-ansible-debian-bookworm-prometheus-opensearch - 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-upgrade diff --git a/zuul.d/scenarios/skyline.yaml b/zuul.d/scenarios/skyline.yaml index c25bbdd96d..6386ad7a62 100644 --- a/zuul.d/scenarios/skyline.yaml +++ b/zuul.d/scenarios/skyline.yaml @@ -29,6 +29,16 @@ parent: kolla-ansible-skyline-sso-base 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: name: kolla-ansible-ubuntu-noble-skyline parent: kolla-ansible-skyline-base @@ -47,5 +57,7 @@ jobs: - kolla-ansible-debian-bookworm-skyline - 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-sso diff --git a/zuul.d/scenarios/telemetry.yaml b/zuul.d/scenarios/telemetry.yaml index ec20cd708f..e95a41a913 100644 --- a/zuul.d/scenarios/telemetry.yaml +++ b/zuul.d/scenarios/telemetry.yaml @@ -18,6 +18,11 @@ parent: kolla-ansible-telemetry-base 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: name: kolla-ansible-ubuntu-noble-telemetry parent: kolla-ansible-telemetry-base @@ -30,4 +35,5 @@ check: jobs: - kolla-ansible-debian-bookworm-telemetry + - kolla-ansible-rocky-10-telemetry - kolla-ansible-ubuntu-noble-telemetry