diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-08-22 14:34:43 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-08-24 19:08:36 +0000 |
| commit | d1a52b58165bbde56381b1d553c242c36eeebc17 (patch) | |
| tree | 85edbf83bd04b2e997fcfb087770153a57ac945f | |
| parent | 0765e276fe046beb955b3db5fbb947108d5222c3 (diff) | |
| download | kolla-ansible-d1a52b58165bbde56381b1d553c242c36eeebc17.tar.gz kolla-ansible-d1a52b58165bbde56381b1d553c242c36eeebc17.zip | |
debian: Add Bookworm Host OS support
Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/892323
Change-Id: I11db700511233aa60229ee65d0cc96e46aafdf90
| -rw-r--r-- | ansible/group_vars/all.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/prechecks/vars/main.yml | 1 | ||||
| -rw-r--r-- | doc/source/user/support-matrix.rst | 1 | ||||
| -rw-r--r-- | releasenotes/notes/debian-bookworm-host-08840d78c88742d3.yaml | 4 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 8 | ||||
| -rw-r--r-- | zuul.d/nodesets.yaml | 20 |
6 files changed, 28 insertions, 10 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 646060e6b..c99a22088 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 580bb126e..c28bf47e9 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 6535bd356..4af3f6b22 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 000000000..c9aaf6912 --- /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 a6eb123ea..d83ba33dc 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 be8630d5e..d238b6cd7 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -12,26 +12,38 @@ 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: - name: primary 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 |
