diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml index f67ab08b87..b55ff5bef8 100644 --- a/ansible/roles/prechecks/vars/main.yml +++ b/ansible/roles/prechecks/vars/main.yml @@ -18,5 +18,4 @@ host_os_distributions: Rocky: - "9" Ubuntu: - - "focal" - "jammy" diff --git a/doc/source/user/operating-kolla.rst b/doc/source/user/operating-kolla.rst index 5ddc224864..a3dd5ada5e 100644 --- a/doc/source/user/operating-kolla.rst +++ b/doc/source/user/operating-kolla.rst @@ -68,13 +68,14 @@ Limitations and Recommendations ``ceph_nova_keyring: ceph.client.nova.keyring`` and ``ceph_nova_user: nova`` in ``/etc/kolla/globals.yml`` -Ubuntu Focal 20.04 +Ubuntu Jammy 22.04 ------------------ -The Victoria release adds support for Ubuntu Focal 20.04 as a host operating -system. Ubuntu users upgrading from Ussuri should first upgrade OpenStack -containers to Victoria, which uses the Ubuntu Focal 20.04 base container image. -Hosts should then be upgraded to Ubuntu Focal 20.04. +The Zed release adds support for Ubuntu Jammy 22.04 as a host operating +system. Ubuntu Jammy 22.04 support will also be addeed to a Yoga stable +release. Ubuntu Focal 20.04 users upgrading from Yoga should first upgrade +OpenStack containers to Zed, which uses the Ubuntu Jammy 22.04 base container +image. Hosts should then be upgraded to Ubuntu Jammy 22.04. CentOS Stream 8 --------------- diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index ba5adfa13f..a297a3c9d3 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -126,20 +126,10 @@ parent: kolla-ansible-debian-upgrade nodeset: kolla-ansible-debian-bullseye-aarch64 -- job: - name: kolla-ansible-ubuntu-binary-upgrade - parent: kolla-ansible-base - nodeset: kolla-ansible-focal - timeout: 9000 - vars: - base_distro: ubuntu - is_upgrade: yes - tls_enabled: true - - job: name: kolla-ansible-ubuntu-upgrade parent: kolla-ansible-base - nodeset: kolla-ansible-focal + nodeset: kolla-ansible-jammy timeout: 9000 vars: base_distro: ubuntu @@ -149,16 +139,17 @@ - job: name: kolla-ansible-ubuntu-upgrade-cephadm parent: kolla-ansible-cephadm-base - nodeset: kolla-ansible-focal-multi + nodeset: kolla-ansible-jammy-multi timeout: 9000 vars: base_distro: ubuntu is_upgrade: yes + cephadm_use_package_from_distribution: true - job: name: kolla-ansible-ubuntu-upgrade-ovn parent: kolla-ansible-ovn-base - nodeset: kolla-ansible-focal-multi + nodeset: kolla-ansible-jammy-multi timeout: 9000 vars: base_distro: ubuntu @@ -222,7 +213,7 @@ - job: name: kolla-ansible-ubuntu-swift-upgrade parent: kolla-ansible-swift-base - nodeset: kolla-ansible-focal-multi + nodeset: kolla-ansible-jammy-multi timeout: 10800 vars: base_distro: ubuntu @@ -343,7 +334,7 @@ - job: name: kolla-ansible-ubuntu-prometheus-opensearch-upgrade parent: kolla-ansible-prometheus-opensearch-base - nodeset: kolla-ansible-focal + nodeset: kolla-ansible-jammy vars: base_distro: ubuntu is_upgrade: yes diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 0fa0fa0b91..be8630d5e5 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -17,12 +17,6 @@ - name: primary label: debian-bullseye-arm64 -- nodeset: - name: kolla-ansible-focal - nodes: - - name: primary - label: ubuntu-focal - - nodeset: name: kolla-ansible-jammy nodes: @@ -51,16 +45,6 @@ - name: primary label: rockylinux-9 -- nodeset: - name: kolla-ansible-focal-multi - nodes: - - name: primary - label: ubuntu-focal - - name: secondary1 - label: ubuntu-focal - - name: secondary2 - label: ubuntu-focal - - nodeset: name: kolla-ansible-jammy-multi nodes: