debian: Add Bookworm Host OS support

Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/892323

Change-Id: I11db700511233aa60229ee65d0cc96e46aafdf90
This commit is contained in:
Michal Nasiadka 2023-08-22 14:34:43 +02:00
parent 0765e276fe
commit d1a52b5816
6 changed files with 28 additions and 10 deletions

View File

@ -1277,14 +1277,14 @@ influxdb_internal_endpoint: "{{ kolla_internal_fqdn | kolla_url(internal_protoco
######################### #########################
distro_python_version_map: { distro_python_version_map: {
"centos": "3.9", "centos": "3.9",
"debian": "3.9", "debian": "3.11",
"rocky": "3.9", "rocky": "3.9",
"ubuntu": "3.10" "ubuntu": "3.10"
} }
kolla_base_distro_version_default_map: { kolla_base_distro_version_default_map: {
"centos": "stream9", "centos": "stream9",
"debian": "bullseye", "debian": "bookworm",
"rocky": "9", "rocky": "9",
"ubuntu": "jammy", "ubuntu": "jammy",
} }

View File

@ -13,6 +13,7 @@ host_os_distributions:
- "9" - "9"
Debian: Debian:
- "bullseye" - "bullseye"
- "bookworm"
openEuler: openEuler:
- "22.03" - "22.03"
Rocky: Rocky:

View File

@ -21,6 +21,7 @@ Kolla Ansible supports the following host Operating Systems (OS):
* CentOS Stream 9 * CentOS Stream 9
* Debian Bullseye (11) * Debian Bullseye (11)
* Debian Bookworm (12)
* openEuler 22.03 LTS * openEuler 22.03 LTS
* Rocky Linux 9 * Rocky Linux 9
* Ubuntu Jammy (22.04) * Ubuntu Jammy (22.04)

View File

@ -0,0 +1,4 @@
---
features:
- |
Supports Debian Bookworm (12) as host distribution.

View File

@ -12,7 +12,7 @@
- job: - job:
name: kolla-ansible-debian-aarch64 name: kolla-ansible-debian-aarch64
parent: kolla-ansible-debian parent: kolla-ansible-debian
nodeset: kolla-ansible-debian-bullseye-aarch64 nodeset: kolla-ansible-debian-bookworm-aarch64
timeout: 10800 timeout: 10800
required-projects: required-projects:
- openstack/kolla - openstack/kolla
@ -20,7 +20,7 @@
- job: - job:
name: kolla-ansible-debian name: kolla-ansible-debian
parent: kolla-ansible-base parent: kolla-ansible-base
nodeset: kolla-ansible-debian-bullseye nodeset: kolla-ansible-debian-bookworm
vars: vars:
base_distro: debian base_distro: debian
tls_enabled: true tls_enabled: true
@ -206,7 +206,7 @@
- job: - job:
name: kolla-ansible-debian-zun name: kolla-ansible-debian-zun
parent: kolla-ansible-zun-base parent: kolla-ansible-zun-base
nodeset: kolla-ansible-debian-bullseye-multi nodeset: kolla-ansible-debian-bookworm-multi
vars: vars:
base_distro: debian base_distro: debian
@ -278,7 +278,7 @@
- job: - job:
name: kolla-ansible-debian-ironic name: kolla-ansible-debian-ironic
parent: kolla-ansible-ironic-base parent: kolla-ansible-ironic-base
nodeset: kolla-ansible-debian-bullseye nodeset: kolla-ansible-debian-bookworm
vars: vars:
base_distro: debian base_distro: debian

View File

@ -11,12 +11,24 @@
- name: primary - name: primary
label: debian-bullseye label: debian-bullseye
- nodeset:
name: kolla-ansible-debian-bookworm
nodes:
- name: primary
label: debian-bookworm
- nodeset: - nodeset:
name: kolla-ansible-debian-bullseye-aarch64 name: kolla-ansible-debian-bullseye-aarch64
nodes: nodes:
- name: primary - name: primary
label: debian-bullseye-arm64 label: debian-bullseye-arm64
- nodeset:
name: kolla-ansible-debian-bookworm-aarch64
nodes:
- name: primary
label: debian-bookworm-arm64
- nodeset: - nodeset:
name: kolla-ansible-jammy name: kolla-ansible-jammy
nodes: nodes:
@ -24,14 +36,14 @@
label: ubuntu-jammy label: ubuntu-jammy
- nodeset: - nodeset:
name: kolla-ansible-debian-bullseye-multi name: kolla-ansible-debian-bookworm-multi
nodes: nodes:
- name: primary - name: primary
label: debian-bullseye label: debian-bookworm
- name: secondary1 - name: secondary1
label: debian-bullseye label: debian-bookworm
- name: secondary2 - name: secondary2
label: debian-bullseye label: debian-bookworm
- nodeset: - nodeset:
name: kolla-ansible-openeuler-22.03-lts name: kolla-ansible-openeuler-22.03-lts