openstack/kayobe
Code Issues Proposed changes

Merge "Add support for Ubuntu Noble Numbat (24.04) LTS"

Browse Source
This commit is contained in:
Zuul 2024-10-16 17:33:44 +00:00 committed by Gerrit Code Review
commit 81b785b169
21 changed files with 75 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/inventory/group_vars/all/apt
View File

@ -30,7 +30,7 @@ apt_keys: []
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
# (optional, default is 'deb')
# * url: URL of the repository
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
# * suites: whitespace-separated list of suites, e.g. noble (optional, default
# is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main')

6
ansible/inventory/group_vars/all/globals
View File

@ -53,12 +53,12 @@ kayobe_ansible_user: "stack"
os_distribution: "rocky"
# OS release. Valid options are "9-stream" when os_distribution is "centos", or
# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
# "ubuntu".
# "9" when os_distribution is "rocky", or "jammy" and "noble" (with "noble"
# being the default) when os_distribution is "ubuntu".
os_release: >-
{{ '9-stream' if os_distribution == 'centos'
else '9' if os_distribution == 'rocky'
else 'jammy' }}
else 'noble' }}
###############################################################################
# Ansible configuration.

4
ansible/inventory/group_vars/all/infra-vms
View File

@ -41,7 +41,7 @@ infra_vm_root_capacity: 50G
infra_vm_root_format: qcow2
# Base image for the infra VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",
@ -50,7 +50,7 @@ infra_vm_root_format: qcow2
# otherwise.
infra_vm_root_image: >-
{%- if os_distribution == 'ubuntu' %}
https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
{%- elif os_distribution == 'rocky' %}
https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
{%- else -%}

2
ansible/inventory/group_vars/all/kolla
View File

@ -66,7 +66,7 @@ kolla_base_distro_version_default_map: {
"centos": "stream9",
"debian": "bullseye",
"rocky": "9",
"ubuntu": "jammy",
"ubuntu": "noble",
}
# Kolla base container image distribution version.

4
ansible/inventory/group_vars/all/seed-vm
View File

@ -41,7 +41,7 @@ seed_vm_root_capacity: 50G
seed_vm_root_format: qcow2
# Base image for the seed VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu",
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",
@ -50,7 +50,7 @@ seed_vm_root_format: qcow2
# otherwise.
seed_vm_root_image: >-
{%- if os_distribution == 'ubuntu' %}
https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
{%- elif os_distribution == 'rocky' %}
https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
{%- else -%}

2
ansible/roles/apt/defaults/main.yml
View File

@ -33,7 +33,7 @@ apt_keys: []
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
# (optional, default is 'deb')
# * url: URL of the repository
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
# * suites: whitespace-separated list of suites, e.g. noble (optional, default
# is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main')

14
doc/source/configuration/reference/hosts.rst
View File

@ -369,7 +369,7 @@ items:
* ``types``: whitespace-separated list of repository types, e.g. ``deb`` or
``deb-src`` (optional, default is ``deb``)
* ``url``: URL of the repository
* ``suites``: whitespace-separated list of suites, e.g. ``jammy`` (optional,
* ``suites``: whitespace-separated list of suites, e.g. ``noble`` (optional,
default is ``ansible_facts.distribution_release``)
* ``components``: whitespace-separated list of components, e.g. ``main``
(optional, default is ``main``)
@ -389,10 +389,10 @@ For example, the following configuration defines a single Apt repository:
apt_repositories:
- types: deb
url: https://example.com/repo
suites: jammy
suites: noble
components: all
In the following example, the Ubuntu Jammy 22.04 repositories are consumed from
In the following example, the Ubuntu Noble 24.04 repositories are consumed from
a local package mirror. The ``apt_disable_sources_list`` variable is set to
``true``, which disables all repositories in ``/etc/apt/sources.list``,
including the default Ubuntu ones.
@ -402,10 +402,10 @@ including the default Ubuntu ones.
apt_repositories:
- url: http://mirror.example.com/ubuntu/
suites: jammy jammy-updates
suites: noble noble-updates
components: main restricted universe multiverse
- url: http://mirror.example.com/ubuntu/
suites: jammy-security
suites: noble-security
components: main restricted universe multiverse
apt_disable_sources_list: true
@ -442,7 +442,7 @@ that is signed by the key.
apt_repositories:
- types: deb
url: https://example.com/repo
suites: jammy
suites: noble
components: all
signed_by: example-key.asc
@ -484,7 +484,7 @@ Some repositories may require authentication using HTTP basic auth. Apt
supports specifying credentials in URLs in ``sources.list`` files, but these
files must be world-readable. A more secure setup involves writing credentials
to `auth.conf
<https://manpages.ubuntu.com/manpages/jammy/man5/apt_auth.conf.5.html>`__
<https://manpages.ubuntu.com/manpages/noble/man5/apt_auth.conf.5.html>`__
files which can have more restrictive permissions.
Auth configuration is defined by the ``apt_auth`` variable. The format is a

2
doc/source/configuration/reference/os-distribution.rst
View File

@ -16,7 +16,7 @@ or ``rocky`` or ``ubuntu``, and defaults to ``rocky``.
The ``os_release`` variable in ``etc/kayobe/globals.yml`` can be used to set
the release of the OS. When ``os_distribution`` is set to ``centos`` it may be
set to ``9-stream``, and this is its default value. When ``os_distribution`` is
set to ``ubuntu`` it may be set to ``jammy``, and this is its default value.
set to ``ubuntu`` it may be set to ``noble``, and this is its default value.
When ``os_distribution`` is set to ``rocky`` it may be set to ``9``, and this
is its default value.

1
doc/source/installation.rst
View File

@ -18,6 +18,7 @@ control host:
- CentOS Stream 9 (since Zed 13.0.0 release)
- Rocky Linux 9 (since Zed 13.0.0 release)
- Ubuntu Jammy 22.04 (since Zed 13.0.0 release)
- Ubuntu Noble 24.04 (since Dalmatian 17.0.0 release)
See the :doc:`support matrix <support-matrix>` for details of supported
Operating Systems for other hosts.

10
doc/source/resources.rst
View File

@ -22,8 +22,8 @@ OpenStack using Kolla, Ansible and Kayobe. The guide makes use of
baremetal environment running on a single hypervisor.
To complete the walkthrough you will require a baremetal or VM hypervisor
running CentOS Stream 9, Rocky Linux 9 or Ubuntu Jammy 22.04 (since Zed 13.0.0) with at least
32GB RAM & 80GB disk space. Preparing the deployment can take some time -
where possible it is beneficial to snapshot the hypervisor. We advise making a
snapshot after creating the initial 'seed' VM as this will make additional
deployments significantly faster.
running CentOS Stream 9, Rocky Linux 9 or Ubuntu Noble 24.04 (since Dalmatian
17.0.0) with at least 32GB RAM & 80GB disk space. Preparing the deployment can
take some time - where possible it is beneficial to snapshot the hypervisor. We
advise making a snapshot after creating the initial 'seed' VM as this will make
additional deployments significantly faster.

1
doc/source/support-matrix.rst
View File

@ -11,6 +11,7 @@ Kayobe supports the following host Operating Systems (OS):
* Rocky Linux 9 (since Zed 13.0.0 release)
* Ubuntu Jammy 22.04 (since Zed 13.0.0 release)
* Ubuntu Noble 24.04 (since Dalmatian 17.0.0 release)
In addition to that CentOS Stream 9 host OS is functional, but not officially
supported. Kolla does not publish CentOS Stream 9 images to Docker Hub/Quay.io,

2
etc/kayobe/apt.yml
View File

@ -30,7 +30,7 @@
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
# (optional, default is 'deb')
# * url: URL of the repository
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
# * suites: whitespace-separated list of suites, e.g. noble (optional, default
# is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main')

2
etc/kayobe/globals.yml
View File

@ -49,7 +49,7 @@
#os_distribution:
# OS release. Valid options are "9-stream" when os_distribution is "centos", or
# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
# "9" when os_distribution is "rocky", or "noble" when os_distribution is
# "ubuntu".
#os_release:

2
etc/kayobe/infra-vms.yml
View File

@ -30,7 +30,7 @@
#infra_vm_root_format:
# Base image for the infra VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",

2
etc/kayobe/seed-vm.yml
View File

@ -30,7 +30,7 @@
#seed_vm_root_format:
# Base image for the seed VM root volume. Default is
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu",
# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",

12
playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
View File

@ -138,15 +138,15 @@ apt_keys:
- url: https://packages.treasuredata.com/GPG-KEY-td-agent
filename: td-agent.asc
apt_repositories:
# Ubuntu jammy repositories.
# Ubuntu noble repositories.
- url: "http://{{ zuul_site_mirror_fqdn }}/ubuntu/"
suites: jammy jammy-updates
components: main restricted universe multiverse
suites: noble noble-updates
components: main universe
- url: "http://{{ zuul_site_mirror_fqdn }}/ubuntu/"
suites: jammy-security
components: main restricted universe multiverse
suites: noble-security
components: main universe
# Treasuredata repository.
- url: http://packages.treasuredata.com/4/ubuntu/jammy/
- url: http://packages.treasuredata.com/5/ubuntu/noble/
components: contrib
signed_by: td-agent.asc
apt_preferences:

6
releasenotes/notes/ubuntu-noble-d60631d22a4f43d5.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Adds support for Ubuntu Noble Numbat (24.04) LTS as a host and container
Operating System for seed, seed hypervisor and overcloud hosts.
Default Ubuntu version has been changed to Ubuntu Noble (24.04) LTS.

4
requirements.yml
View File

@ -42,8 +42,8 @@ roles:
version: 1.0.0
- src: stackhpc.libvirt-host
version: v1.12.1
- name: stackhpc.libvirt-vm
version: v1.16.1
- src: stackhpc.libvirt-vm
version: v1.16.2
- src: stackhpc.luks
version: 0.4.2
- src: stackhpc.os-ironic-state

28
zuul.d/jobs.yaml
View File

@ -131,9 +131,9 @@
nodeset: kayobe-rocky9
- job:
name: kayobe-overcloud-ubuntu-jammy
name: kayobe-overcloud-ubuntu-noble
parent: kayobe-overcloud-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble
- job:
name: kayobe-overcloud-tls-base
@ -210,9 +210,9 @@
nodeset: kayobe-rocky9
- job:
name: kayobe-seed-ubuntu-jammy
name: kayobe-seed-ubuntu-noble
parent: kayobe-seed-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble
- job:
name: kayobe-seed-images-base
@ -244,9 +244,9 @@
# This job builds default overcloud images but skips the build of bifrost seed
# images which are currently timing out on Ubuntu Jammy.
- job:
name: kayobe-seed-images-ubuntu-jammy
name: kayobe-seed-images-ubuntu-noble
parent: kayobe-seed-images-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble
vars:
seed_container_image_regex: "^base"
@ -273,9 +273,9 @@
nodeset: kayobe-rocky9
- job:
name: kayobe-overcloud-host-configure-ubuntu-jammy
name: kayobe-overcloud-host-configure-ubuntu-noble
parent: kayobe-overcloud-host-configure-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble
- job:
name: kayobe-seed-upgrade-base
@ -333,9 +333,9 @@
nodeset: kayobe-rocky9
- job:
name: kayobe-seed-vm-ubuntu-jammy
name: kayobe-seed-vm-ubuntu-noble
parent: kayobe-seed-vm-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble
- job:
name: kayobe-seed-vm-efi-base
@ -358,9 +358,9 @@
nodeset: kayobe-rocky9
- job:
name: kayobe-seed-vm-ubuntu-jammy-efi
name: kayobe-seed-vm-ubuntu-noble-efi
parent: kayobe-seed-vm-efi-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble
- job:
name: kayobe-infra-vm-base
@ -386,6 +386,6 @@
nodeset: kayobe-rocky9
- job:
name: kayobe-infra-vm-ubuntu-jammy
name: kayobe-infra-vm-ubuntu-noble
parent: kayobe-infra-vm-base
nodeset: kayobe-ubuntu-jammy
nodeset: kayobe-ubuntu-noble

6
zuul.d/nodesets.yaml
View File

@ -16,3 +16,9 @@
nodes:
- name: primary
label: ubuntu-jammy
- nodeset:
name: kayobe-ubuntu-noble
nodes:
- name: primary
label: ubuntu-noble

24
zuul.d/project.yaml
View File

@ -13,46 +13,46 @@
- kayobe-tox-molecule
- kayobe-overcloud-rocky9
- kayobe-overcloud-centos9s
- kayobe-overcloud-ubuntu-jammy
- kayobe-overcloud-ubuntu-noble
- kayobe-overcloud-tls-rocky9
- kayobe-overcloud-host-configure-rocky9
- kayobe-overcloud-host-configure-centos9s
- kayobe-overcloud-host-configure-ubuntu-jammy
- kayobe-overcloud-host-configure-ubuntu-noble
- kayobe-overcloud-upgrade-rocky9
- kayobe-overcloud-upgrade-ubuntu-jammy
- kayobe-seed-rocky9
- kayobe-seed-ubuntu-jammy
- kayobe-seed-ubuntu-noble
- kayobe-seed-images-rocky9
- kayobe-seed-upgrade-rocky9
- kayobe-seed-upgrade-ubuntu-jammy
- kayobe-seed-vm-rocky9
- kayobe-seed-vm-rocky9-efi
- kayobe-seed-vm-ubuntu-jammy
- kayobe-seed-vm-ubuntu-jammy-efi
- kayobe-seed-vm-ubuntu-noble
- kayobe-seed-vm-ubuntu-noble-efi
- kayobe-infra-vm-rocky9
- kayobe-infra-vm-ubuntu-jammy
- kayobe-infra-vm-ubuntu-noble
gate:
jobs:
- kayobe-tox-ansible-syntax
- kayobe-tox-ansible
- kayobe-tox-molecule
- kayobe-overcloud-rocky9
- kayobe-overcloud-ubuntu-jammy
- kayobe-overcloud-ubuntu-noble
- kayobe-overcloud-tls-rocky9
- kayobe-overcloud-host-configure-rocky9
- kayobe-overcloud-host-configure-ubuntu-jammy
- kayobe-overcloud-host-configure-ubuntu-noble
- kayobe-overcloud-upgrade-rocky9
- kayobe-overcloud-upgrade-ubuntu-jammy
- kayobe-seed-rocky9
- kayobe-seed-ubuntu-jammy
- kayobe-seed-ubuntu-noble
- kayobe-seed-upgrade-rocky9
- kayobe-seed-upgrade-ubuntu-jammy
- kayobe-seed-vm-rocky9
- kayobe-seed-vm-ubuntu-jammy
- kayobe-seed-vm-ubuntu-noble
- kayobe-infra-vm-rocky9
- kayobe-infra-vm-ubuntu-jammy
- kayobe-infra-vm-ubuntu-noble
experimental:
jobs:
- kayobe-seed-images-centos9s
- kayobe-seed-images-ubuntu-jammy
- kayobe-seed-images-ubuntu-noble