diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 646060e6b2..c99a220888 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1277,14 +1277,14 @@ influxdb_internal_endpoint: "{{ kolla_internal_fqdn | kolla_url(internal_protoco ######################### distro_python_version_map: { "centos": "3.9", - "debian": "3.9", + "debian": "3.11", "rocky": "3.9", "ubuntu": "3.10" } kolla_base_distro_version_default_map: { "centos": "stream9", - "debian": "bullseye", + "debian": "bookworm", "rocky": "9", "ubuntu": "jammy", } diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index 580bb126e1..c28bf47e9c 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -13,6 +13,7 @@ host_os_distributions: - "9" Debian: - "bullseye" + - "bookworm" openEuler: - "22.03" Rocky: diff --git a/doc/source/user/support-matrix.rst b/doc/source/user/support-matrix.rst index 6535bd356c..4af3f6b229 100644 --- a/doc/source/user/support-matrix.rst +++ b/doc/source/user/support-matrix.rst @@ -21,6 +21,7 @@ Kolla Ansible supports the following host Operating Systems (OS): * CentOS Stream 9 * Debian Bullseye (11) +* Debian Bookworm (12) * openEuler 22.03 LTS * Rocky Linux 9 * Ubuntu Jammy (22.04) diff --git a/releasenotes/notes/debian-bookworm-host-08840d78c88742d3.yaml b/releasenotes/notes/debian-bookworm-host-08840d78c88742d3.yaml new file mode 100644 index 0000000000..c9aaf6912a --- /dev/null +++ b/releasenotes/notes/debian-bookworm-host-08840d78c88742d3.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Supports Debian Bookworm (12) as host distribution. diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index a6eb123ea3..d83ba33dc6 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -12,7 +12,7 @@ - job: name: kolla-ansible-debian-aarch64 parent: kolla-ansible-debian - nodeset: kolla-ansible-debian-bullseye-aarch64 + nodeset: kolla-ansible-debian-bookworm-aarch64 timeout: 10800 required-projects: - openstack/kolla @@ -20,7 +20,7 @@ - job: name: kolla-ansible-debian parent: kolla-ansible-base - nodeset: kolla-ansible-debian-bullseye + nodeset: kolla-ansible-debian-bookworm vars: base_distro: debian tls_enabled: true @@ -206,7 +206,7 @@ - job: name: kolla-ansible-debian-zun parent: kolla-ansible-zun-base - nodeset: kolla-ansible-debian-bullseye-multi + nodeset: kolla-ansible-debian-bookworm-multi vars: base_distro: debian @@ -278,7 +278,7 @@ - job: name: kolla-ansible-debian-ironic parent: kolla-ansible-ironic-base - nodeset: kolla-ansible-debian-bullseye + nodeset: kolla-ansible-debian-bookworm vars: base_distro: debian diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index be8630d5e5..d238b6cd75 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -11,12 +11,24 @@ - name: primary label: debian-bullseye +- nodeset: + name: kolla-ansible-debian-bookworm + nodes: + - name: primary + label: debian-bookworm + - nodeset: name: kolla-ansible-debian-bullseye-aarch64 nodes: - name: primary label: debian-bullseye-arm64 +- nodeset: + name: kolla-ansible-debian-bookworm-aarch64 + nodes: + - name: primary + label: debian-bookworm-arm64 + - nodeset: name: kolla-ansible-jammy nodes: @@ -24,14 +36,14 @@ label: ubuntu-jammy - nodeset: - name: kolla-ansible-debian-bullseye-multi + name: kolla-ansible-debian-bookworm-multi nodes: - name: primary - label: debian-bullseye + label: debian-bookworm - name: secondary1 - label: debian-bullseye + label: debian-bookworm - name: secondary2 - label: debian-bullseye + label: debian-bookworm - nodeset: name: kolla-ansible-openeuler-22.03-lts