Merge pull request #700 from stackhpc/upstream/2024.1-2025-04-02

Synchronise 2024.1 with upstream

Author: seunghun1ee

ansible/roles/prechecks/vars/main.yml

@@ -20,3 +20,4 @@ host_os_distributions:
     - "9"
   Ubuntu:
     - "jammy"
+    - "noble"

doc/source/user/support-matrix.rst

@@ -25,6 +25,13 @@ Kolla Ansible supports the following host Operating Systems (OS):
 * openEuler 22.03 LTS
 * Rocky Linux 9
 * Ubuntu Jammy (22.04)
+* Ubuntu Noble (24.04)
+
+.. note::
+
+  Ubuntu Noble (24.04) can use both Jammy (default) and Noble based Kolla images.
+  In order to use the latter - please set ``kolla_base_distro_version`` to
+  ``noble`` and ``distro_python_version`` to ``3.12``.
 
 Supported container images
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

releasenotes/notes/ubuntu-noble-936f8c63ce5801e3.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Adds support for ``Ubuntu Noble Numbat 24.04`` as a host operating system.

roles/cephadm/tasks/pkg_debian.yml

@@ -15,6 +15,8 @@
 
 - name: Install cephadm
   apt:
-    name: cephadm
+    name:
+      - cephadm
+      - python3-jinja2
     install_recommends: False
   become: True

tests/run.yml

@@ -342,6 +342,7 @@
         chdir: "{{ kolla_ansible_src_dir }}"
       environment:
         BASE_DISTRO: "{{ base_distro }}"
+        BASE_DISTRO_TAG: "{{ base_distro_tag | default('') }}"
         BUILD_IMAGE: "{{ need_build_image }}"
         KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/opendev.org/openstack/kolla"
         SCENARIO: "{{ scenario }}"

tests/setup_gate.sh

@@ -88,6 +88,12 @@ base_image = quay.io/openstack.kolla/${BASE_DISTRO}
 EOF
     fi
 
+    if [[ $BASE_DISTRO_TAG != "" ]]; then
+        sudo tee -a /etc/kolla/kolla-build.conf <<EOF
+base_tag = ${BASE_DISTRO_TAG}
+EOF
+    fi
+
     sudo tee -a /etc/kolla/kolla-build.conf <<EOF
 [profiles]
 gate = ${GATE_IMAGES}

tests/templates/globals-default.j2

@@ -10,6 +10,10 @@ network_interface: "{{ api_interface_name }}"
 network_address_family: "{{ address_family }}"
 kolla_container_engine: "{{ container_engine }}"
 docker_restart_policy: "no"
+{% if base_distro_version is defined and base_distro_version == "noble" %}
+distro_python_version: "3.12"
+kolla_base_distro_version: "noble"
+{% endif %}
 
 docker_apt_url: "http://{{ zuul_site_mirror_fqdn }}:8080/docker/{{ ansible_facts.distribution | lower }}"
 docker_yum_url: "http://{{ zuul_site_mirror_fqdn }}:8080/docker/centos"

zuul.d/base.yaml

@@ -46,7 +46,7 @@
     pre-run: tests/pre.yml
     run: tests/run.yml
     post-run: tests/post.yml
-    timeout: 7200
+    timeout: 9000
     post-timeout: 1800
     required-projects:
       - openstack/ansible-collection-kolla