Merge "Drop support for CentOS Stream 9 and Rocky Linux 9"

Zuul · openstack-gerrit · commit 6fc762886d55 · 2025-11-12T21:58:55.000Z
diff --git a/ansible/inventory/group_vars/all/globals b/ansible/inventory/group_vars/all/globals
@@ -52,13 +52,12 @@ kayobe_ansible_user: "stack"
 # is "rocky".
 os_distribution: "rocky"
 
-# 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. Valid options are "10-stream" when os_distribution is "centos",
+# "10" 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'
+  {{ '10-stream' if os_distribution == 'centos'
+  else '10' if os_distribution == 'rocky'
   else 'noble' }}
 
 ###############################################################################
diff --git a/ansible/inventory/group_vars/all/infra-vms b/ansible/inventory/group_vars/all/infra-vms
@@ -43,30 +43,18 @@ 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",
-# "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
+# when os_distribution is "rocky", 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.
 infra_vm_data_capacity: 100G
diff --git a/ansible/inventory/group_vars/all/seed-vm b/ansible/inventory/group_vars/all/seed-vm
@@ -43,30 +43,18 @@ 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" 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
+# when os_distribution is "rocky", 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.
 seed_vm_data_capacity: 100G
diff --git a/ansible/roles/kolla-ansible/vars/RedHat.yml b/ansible/roles/kolla-ansible/vars/RedHat.yml
@@ -5,6 +5,6 @@ kolla_ansible_package_dependencies:
   - git
   - libffi-devel
   - openssl-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' }}"
+  - python3
+  - python3-devel
   - rsync
diff --git a/dev/functions b/dev/functions
@@ -141,18 +141,10 @@ function is_yum {
     fi
 }
 
-function get_python {
-  if is_dnf; then
-      echo python3.12
-  else
-      echo python3
-  fi
-}
-
 function install_dependencies {
     echo "Installing package dependencies for kayobe"
     if is_dnf; then
-        sudo dnf -y install gcc git vim python3-devel python3-pyyaml libffi-devel python3.12-devel python3.12 python3.12-pyyaml
+        sudo dnf -y install gcc git vim python3-devel python3-pyyaml libffi-devel
     elif is_yum; then
         echo "CentOS 7 is no longer supported"
         exit 1
@@ -174,7 +166,7 @@ function install_venv {
     fi
     if [[ ! -f "${venv_path}/bin/activate" ]]; then
         echo "Creating virtual environment in ${venv_path}"
-        $(get_python) -m venv "${venv_path}"
+        python3 -m venv "${venv_path}"
         # NOTE: Virtualenv's activate and deactivate scripts reference an
         # unbound variable.
         set +u
@@ -200,9 +192,7 @@ function install_venv_system_site_packages {
     fi
     if [[ ! -f "${venv_path}/bin/activate" ]]; then
         echo "Creating virtual environment in ${venv_path}"
-        # NOTE(wszumski): tenks doesn't currently support not using the system python
-        # interpreter with: "Failed to detect selinux python bindings"
-        /usr/bin/python3 -m venv --system-site-packages "${venv_path}"
+        python3 -m venv --system-site-packages "${venv_path}"
         # NOTE: Virtualenv's activate and deactivate scripts reference an
         # unbound variable.
         set +u
@@ -228,9 +218,7 @@ function install_kayobe_dev_venv {
 
 function upgrade_kayobe_venv {
     echo "Upgrading kayobe virtual environment in ${KAYOBE_VENV_PATH}"
-    # NOTE(wszumski): We need to recreate the old virtualenv to switch to python3.12
-    rm -rf "${KAYOBE_VENV_PATH}"
-    $(get_python) -m venv "${KAYOBE_VENV_PATH}"
+    python3 -m venv "${KAYOBE_VENV_PATH}"
     # NOTE: Virtualenv's activate and deactivate scripts reference an
     # unbound variable.
     set +u
diff --git a/doc/source/configuration/reference/bifrost.rst b/doc/source/configuration/reference/bifrost.rst
@@ -77,7 +77,7 @@ information on building disk images.
 
 The default configuration builds a whole disk (partitioned) image using the
 selected :ref:`OS distribution <os-distribution>` with serial console enabled,
-and SELinux disabled if CentOS Stream is used. Rocky Linux 9 users should use
+and SELinux disabled if CentOS Stream is used. Rocky Linux 10 users should use
 the default method of building images with
 :ref:`Diskimage builder directly <overcloud-dib>`.
 
diff --git a/doc/source/configuration/reference/network.rst b/doc/source/configuration/reference/network.rst
@@ -302,8 +302,7 @@ String format rules (CentOS Stream/Rocky Linux only)
 
 The string format of a rule is the string which would be appended to ``ip rule
 <add|del>`` to create or delete the rule. Note that when using NetworkManager
-(the default since Zed and in Yoga when using Rocky Linux 9) the table must be
-specified by ID.
+(the default when using Rocky Linux 10) the table must be specified by ID.
 
 To configure a network called ``example`` with an IP routing policy rule to
 handle traffic from the subnet ``10.1.0.0/24`` using the routing table with ID
@@ -396,9 +395,9 @@ The following attributes are supported:
 ``bridge_stp``
     .. note::
 
-       For Rocky Linux 9, the ``bridge_stp`` attribute is set to false to preserve
-       backwards compatibility with network scripts. This is because the Network
-       Manager sets STP to true by default on bridges.
+       For Rocky Linux 10, the ``bridge_stp`` attribute is set to false to
+       preserve backwards compatibility with network scripts. This is because
+       the Network Manager sets STP to true by default on bridges.
 
     Enable or disable the Spanning Tree Protocol (STP) on this bridge. Should be
     set to a boolean value. The default is not set on Ubuntu systems.
diff --git a/doc/source/configuration/reference/os-distribution.rst b/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`` 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.
+set to ``10-stream``, and this is its default value. When ``os_distribution``
+is set to ``rocky`` it may be set to ``10``, 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.
 
 These variables are used to set various defaults, including:
 
diff --git a/doc/source/configuration/reference/overcloud-dib.rst b/doc/source/configuration/reference/overcloud-dib.rst
@@ -34,7 +34,7 @@ how these images are built. Consult the
 information on building disk images.
 
 The default configuration builds a whole disk (partitioned) image using the
-selected :ref:`OS distribution <os-distribution>` (Rocky Linux 9 by default)
+selected :ref:`OS distribution <os-distribution>` (Rocky Linux 10 by default)
 with serial console enabled, and SELinux disabled if CentOS Stream or Rocky
 Linux is used.
 `Cloud-init <https://cloudinit.readthedocs.io/en/latest/>`__ is used to process
diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst
@@ -18,7 +18,7 @@ running kayobe's tests.
 
       sudo apt-get install build-essential python3-dev libssl-dev python3-pip git
 
-* Fedora or CentOS Stream 9/Rocky 9/RHEL 9::
+* Fedora or CentOS Stream 10/Rocky 10/RHEL 10::
 
       sudo dnf install python3-devel openssl-devel python3-pip git gcc
 
diff --git a/doc/source/installation.rst b/doc/source/installation.rst
@@ -15,8 +15,8 @@ Prerequisites
 Currently Kayobe supports the following Operating Systems on the Ansible
 control host:
 
-- CentOS Stream 9 (since Zed 13.0.0 release)
-- Rocky Linux 9 (since Zed 13.0.0 release)
+- CentOS Stream 10 (since Flamingo 19.0.0 release)
+- Rocky Linux 10 (since Flamingo 19.0.0 release)
 - Ubuntu Noble 24.04 (since Dalmatian 17.0.0 release)
 
 See the :doc:`support matrix <support-matrix>` for details of supported
diff --git a/doc/source/resources.rst b/doc/source/resources.rst
@@ -22,8 +22,9 @@ OpenStack using Kolla, Ansible and Kayobe. The guide makes use of
 baremetal environment running on a single hypervisor.
 
 To complete the walkthrough you will require a baremetal or VM hypervisor
-running CentOS Stream 9, Rocky Linux 9 or Ubuntu Noble 24.04 (since Dalmatian
-17.0.0) with at least 32GB RAM & 80GB disk space.  Preparing the deployment can
-take some time - where possible it is beneficial to snapshot the hypervisor. We
-advise making a snapshot after creating the initial 'seed' VM as this will make
-additional deployments significantly faster.
+running CentOS Stream 10 (since Flamingo 19.0.0), Rocky Linux 10 (since
+Flamingo 19.0.0) or Ubuntu Noble 24.04 (since Dalmatian 17.0.0) with at least
+32GB RAM & 80GB disk space. Preparing the deployment can take some time - where
+possible it is beneficial to snapshot the hypervisor. We advise making a
+snapshot after creating the initial 'seed' VM as this will make additional
+deployments significantly faster.
diff --git a/doc/source/support-matrix.rst b/doc/source/support-matrix.rst
@@ -9,22 +9,24 @@ Supported Operating Systems
 
 Kayobe supports the following host Operating Systems (OS):
 
-* Rocky Linux 9 (since Zed 13.0.0 release)
+* Rocky Linux 10 (since Flamingo 19.0.0 release)
 * Ubuntu Noble 24.04 (since Dalmatian 17.0.0 release)
 
-In addition to that CentOS Stream 9 host OS is functional, but not officially
-supported. Kolla does not publish CentOS Stream 9 images to Docker Hub/Quay.io,
+In addition to that CentOS Stream 10 host OS is functional, but not officially
+supported. Kolla does not publish CentOS Stream 10 images to Docker Hub/Quay.io,
 therefore users need to build them by themselves.
 
 .. note::
 
-   CentOS Stream 8 is no longer supported as a host OS. The Yoga release
-   supports both CentOS Stream 8 and 9, and provides a route for migration.
+   CentOS Stream 9 is no longer supported as a host OS. The 2025.1 Epoxy
+   release will in future support both CentOS Stream 9 and 10 to provide a
+   route for migration.
 
 .. note::
 
-   Rocky Linux 8 is no longer supported as a host OS. The Yoga release supports
-   both Rocky Linux 8 and 9, and provides a route for migration.
+   Rocky Linux 9 is no longer supported as a host OS. The 2025.1 Epoxy release
+   will in future support both CentOS Stream 9 and 10 to provide a route for
+   migration.
 
 Supported container images
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
@@ -48,9 +48,9 @@
 # is "rocky".
 #os_distribution:
 
-# 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 release. Valid options are "10-stream" when os_distribution is "centos",
+# "10" when os_distribution is "rocky", or "noble" when os_distribution is
+# "ubuntu".
 # os_distribution is "ubuntu".
 #os_release:
 
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
@@ -32,12 +32,8 @@
 # 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",
-# "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
+# when os_distribution is "rocky", 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:
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
@@ -32,12 +32,8 @@
 # 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" 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
+# when os_distribution is "rocky", 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:
diff --git a/kayobe/plugins/filter/networks.py b/kayobe/plugins/filter/networks.py
@@ -283,9 +283,9 @@ def net_macaddress(context, name, inventory_hostname=None):
 def net_bridge_stp(context, name, inventory_hostname=None):
     """Return the Spanning Tree Protocol (STP) state for a bridge.
 
-    On RL9 if STP is not defined, default it to 'false' to preserve
-    compatibility with network scripts. STP is 'true' in NetworkManager
-    by default, so we set it to 'false' here.
+    On RL10 if STP is not defined, default it to 'false' to preserve
+    compatibility with network scripts. STP is 'true' in NetworkManager by
+    default, so we set it to 'false' here.
 
     :param context: Jinja2 Context object.
     :param name: The name of the network.
diff --git a/playbooks/kayobe-infra-vm-base/infra-vms-group-vars.j2 b/playbooks/kayobe-infra-vm-base/infra-vms-group-vars.j2
@@ -1,5 +1,5 @@
 ---
-{% if infra_vm_use_cirros | default(true) or ansible_os_family == 'RedHat' and ansible_distribution_major_version == '9' %}
+{% if infra_vm_use_cirros | default(true) %}
 aio_interface: eth0
 {% else %}
 # Required for official cloud images (CentOS Stream 10, Rocky Linux 10, Ubuntu)
diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2
@@ -56,8 +56,8 @@ kolla_ironic_kernel_append_params_extra:
   - ipa-insecure=1
 {% endif %}
 
-# NOTE(bbezak): Kolla does not build CentOS Stream 9 container images.
-# Using Rocky Linux 9 images on CentOS Stream 9 in CI.
+# NOTE(bbezak): Kolla does not build CentOS Stream 10 container images.
+# Using Rocky Linux 10 images on CentOS Stream 10 in CI.
 kolla_base_distro: "{% raw %}{{ 'rocky' if os_distribution == 'centos' else os_distribution }}{% endraw %}"
 
 # Support overriding container_engine
diff --git a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
@@ -164,21 +164,6 @@ apt_auth:
 {% endif %}
 
 {% if ansible_facts.os_family == 'RedHat' %}
-# NOTE: There are OpenDev mirrors only for centos-stream/9-stream and epel/9.
-{% if ansible_facts.distribution_major_version == "9" %}
-# Use a local DNF mirror.
-dnf_use_local_mirror: true
-{% if ansible_facts.distribution == 'CentOS' %}
-# Mirror FQDN for DNF repos.
-dnf_centos_mirror_host: "{{ zuul_site_mirror_fqdn }}"
-# Mirror directory for DNF CentOS repos.
-dnf_centos_mirror_directory: 'centos-stream'
-{% endif %}
-# Mirror FQDN for DNF EPEL repos.
-dnf_epel_mirror_host: "{{ zuul_site_mirror_fqdn }}"
-# Mirror directory for DNF EPEL repos.
-dnf_epel_mirror_directory: 'epel'
-{% endif %}
 # Configure a custom DNF repository.
 dnf_custom_repos:
   fluent-package:
diff --git a/playbooks/kayobe-overcloud-host-configure-base/pre.yml b/playbooks/kayobe-overcloud-host-configure-base/pre.yml
@@ -10,25 +10,14 @@
           - python3-setuptools
       become: true
 
-    - name: Install Python3.12 on RHEL derivatives
-      dnf:
-        name:
-          - python3.12
-          - python3.12-devel
-        state: latest
-      when: ansible_facts.os_family == 'RedHat'
-      become: true
-
     - name: Ensure testinfra is installed
-      vars:
-        cmd: "{{ 'python3.12' if ansible_facts.os_family == 'RedHat' else 'python3' }} -m venv"
       pip:
         name:
           - distro
           - pytest-testinfra
           - pytest-html
         virtualenv: "{{ testinfra_venv }}"
-        virtualenv_command: "{{ cmd }}"
+        virtualenv_command: python3 -m venv
 
     # NOTE(mgoddard): Use the name zz-30-overrides.yml to ensure this takes
     # precedence over the standard config files and zz-20-overrides.yml from
diff --git a/playbooks/kayobe-seed-vm-base/seed-group-vars.j2 b/playbooks/kayobe-seed-vm-base/seed-group-vars.j2
@@ -1,5 +1,5 @@
 ---
-{% if seed_vm_use_cirros | default(true) or ansible_os_family == 'RedHat' and ansible_distribution_major_version == '9' %}
+{% if seed_vm_use_cirros | default(true) %}
 aio_interface: eth0
 {% else %}
 # Required for official cloud images (CentOS Stream 10, Rocky Linux 10, Ubuntu)
diff --git a/releasenotes/notes/rocky-10-8d56e4bfffe39c08.yaml b/releasenotes/notes/rocky-10-8d56e4bfffe39c08.yaml
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
