openstack
/
kayobe
Code Issues Proposed changes

Merge "Add support for Ubuntu Jammy Jellyfish (22.04) LTS"

This commit is contained in:
Zuul 2022-08-08 09:29:02 +00:00 committed by Gerrit Code Review
parent 2b308d6747 ebf8cfca62
commit a2f9801034
20 changed files with 65 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/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. focal (optional, default
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
# is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main')

4
ansible/group_vars/all/globals
View File

@ -49,12 +49,12 @@ kayobe_ansible_user: "stack"
os_distribution: "centos"
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
# "8" when os_distribution is "rocky", or "focal" when os_distribution is
# "8" when os_distribution is "rocky", or "jammy" when os_distribution is
# "ubuntu".
os_release: >-
{{ '8-stream' if os_distribution == 'centos'
else '8' if os_distribution == 'rocky'
else 'focal' }}
else 'jammy' }}
###############################################################################
# Ansible configuration.

4
ansible/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/focal/current/focal-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-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/focal/current/focal-server-cloudimg-amd64.img
https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
{%- elif os_distribution == 'rocky' %}
https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
{%- else -%}

4
ansible/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/focal/current/focal-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu",
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-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/focal/current/focal-server-cloudimg-amd64.img
https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
{%- elif os_distribution == 'rocky' %}
https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-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. focal (optional, default
# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
# is ansible_facts.distribution_release)
# * components: whitespace-separated list of components, e.g. main (optional,
# default is 'main')

9
ansible/roles/apt/tasks/repos.yml
View File

@ -1,4 +1,13 @@
---
- name: Ensure the Apt sources.list.d directory exists
file:
path: "/etc/apt/sources.list.d"
state: directory
owner: root
group: root
mode: 0755
become: true
# NOTE(mgoddard): Use the modern deb822 repository format rather than the old
# format used by the apt_repository module.
- name: Configure apt repositories

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

@ -366,7 +366,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. ``focal`` (optional,
* ``suites``: whitespace-separated list of suites, e.g. ``jammy`` (optional,
default is ``ansible_facts.distribution_release``)
* ``components``: whitespace-separated list of components, e.g. ``main``
(optional, default is ``main``)
@ -385,10 +385,10 @@ For example, the following configuration defines a single Apt repository:
apt_repositories:
- types: deb
url: https://example.com/repo
suites: focal
suites: jammy
components: all
In the following example, the Ubuntu Focal 20.04 repositories are consumed from
In the following example, the Ubuntu Jammy 22.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.
@ -398,10 +398,10 @@ including the default Ubuntu ones.
apt_repositories:
- url: http://mirror.example.com/ubuntu/
suites: focal focal-updates
suites: jammy jammy-updates
components: main restricted universe multiverse
- url: http://mirror.example.com/ubuntu/
suites: focal-security
suites: jammy-security
components: main restricted universe multiverse
apt_disable_sources_list: true
@ -438,7 +438,7 @@ that is signed by the key.
apt_repositories:
- types: deb
url: https://example.com/repo
suites: focal
suites: jammy
components: all
signed_by: example-key.asc

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

@ -16,7 +16,7 @@ or ``rocky`` or ``ubuntu``, and defaults to ``centos``.
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 ``8-stream``, and this is its default value. When ``os_distribution`` is
set to ``ubuntu`` it may be set to ``focal``, and this is its default value.
set to ``ubuntu`` it may be set to ``jammy``, and this is its default value.
When ``os_distribution`` is set to ``rocky`` it may be set to ``8``, and this
is its default value.

2
doc/source/installation.rst
View File

@ -17,7 +17,7 @@ control host:
- CentOS Stream 8 (since Wallaby 10.0.0 release)
- Rocky Linux 8 (since Yoga 12.0.0 release)
- Ubuntu Focal 20.04 (since Wallaby 10.0.0 release)
- Ubuntu Jammy 22.04 (since Zed 13.0.0 release)
See the :doc:`support matrix <support-matrix>` for details of supported
Operating Systems for other hosts.

2
doc/source/resources.rst
View File

@ -22,7 +22,7 @@ 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 8 or Ubuntu Focal 20.04 (since Wallaby 10.0.0) with at least
running CentOS 8 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

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

@ -11,7 +11,7 @@ Kayobe supports the following host Operating Systems (OS):
* CentOS Stream 8 (since Wallaby 10.0.0 release)
* Rocky Linux 8 (since Yoga 12.0.0 release)
* Ubuntu Focal 20.04 (since Wallaby 10.0.0 release)
* Ubuntu Jammy 22.04 (since Zed 13.0.0 release)
.. note::

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. focal (optional, default
# * suites: whitespace-separated list of suites, e.g. jammy (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

@ -50,7 +50,7 @@
#os_distribution:
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
# "8" when os_distribution is "rocky", or "focal" when os_distribution is
# "8" when os_distribution is "rocky", or "jammy" 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/focal/current/focal-server-cloudimg-amd64.img"
# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
# when os_distribution is "ubuntu", or
# https://dl.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud.latest.x86_64.qcow2
# when os_distribution is "rocky",

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

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

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

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

5
releasenotes/notes/ubuntu-jammy-515047cd1ae85151.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Adds support for Ubuntu Jammy Jellyfish (22.04) LTS as a host and
container Operating System for seed, seed hypervisor and overcloud hosts.

24
zuul.d/jobs.yaml
View File

@ -124,9 +124,9 @@
nodeset: kayobe-rocky8
- job:
name: kayobe-overcloud-ubuntu-focal
name: kayobe-overcloud-ubuntu-jammy
parent: kayobe-overcloud-base
nodeset: kayobe-ubuntu-focal
nodeset: kayobe-ubuntu-jammy
- job:
name: kayobe-overcloud-tls-base
@ -186,9 +186,9 @@
nodeset: kayobe-rocky8
- job:
name: kayobe-seed-ubuntu-focal
name: kayobe-seed-ubuntu-jammy
parent: kayobe-seed-base
nodeset: kayobe-ubuntu-focal
nodeset: kayobe-ubuntu-jammy
- job:
name: kayobe-seed-images-base
@ -212,9 +212,9 @@
nodeset: kayobe-rocky8
- job:
name: kayobe-seed-images-ubuntu-focal
name: kayobe-seed-images-ubuntu-jammy
parent: kayobe-seed-images-base
nodeset: kayobe-ubuntu-focal
nodeset: kayobe-ubuntu-jammy
- job:
name: kayobe-overcloud-host-configure-base
@ -238,9 +238,9 @@
nodeset: kayobe-rocky8
- job:
name: kayobe-overcloud-host-configure-ubuntu-focal
name: kayobe-overcloud-host-configure-ubuntu-jammy
parent: kayobe-overcloud-host-configure-base
nodeset: kayobe-ubuntu-focal
nodeset: kayobe-ubuntu-jammy
- job:
name: kayobe-seed-upgrade-base
@ -287,9 +287,9 @@
nodeset: kayobe-rocky8
- job:
name: kayobe-seed-vm-ubuntu-focal
name: kayobe-seed-vm-ubuntu-jammy
parent: kayobe-seed-vm-base
nodeset: kayobe-ubuntu-focal
nodeset: kayobe-ubuntu-jammy
- job:
name: kayobe-infra-vm-base
@ -314,6 +314,6 @@
nodeset: kayobe-rocky8
- job:
name: kayobe-infra-vm-ubuntu-focal
name: kayobe-infra-vm-ubuntu-jammy
parent: kayobe-infra-vm-base
nodeset: kayobe-ubuntu-focal
nodeset: kayobe-ubuntu-jammy

4
zuul.d/nodesets.yaml
View File

@ -13,7 +13,7 @@
label: rockylinux-8
- nodeset:
name: kayobe-ubuntu-focal
name: kayobe-ubuntu-jammy
nodes:
- name: primary
label: ubuntu-focal
label: ubuntu-jammy

22
zuul.d/project.yaml
View File

@ -13,25 +13,25 @@
- kayobe-tox-molecule
- kayobe-overcloud-centos8s
- kayobe-overcloud-rocky8
- kayobe-overcloud-ubuntu-focal
- kayobe-overcloud-ubuntu-jammy
- kayobe-overcloud-tls-centos8s
- kayobe-overcloud-host-configure-centos8s
- kayobe-overcloud-host-configure-rocky8
- kayobe-overcloud-host-configure-ubuntu-focal
- kayobe-overcloud-host-configure-ubuntu-jammy
- kayobe-overcloud-upgrade-centos8s
- kayobe-overcloud-upgrade-ubuntu-focal
- kayobe-seed-centos8s
- kayobe-seed-rocky8
- kayobe-seed-ubuntu-focal
- kayobe-seed-ubuntu-jammy
- kayobe-seed-images-centos8s
- kayobe-seed-upgrade-centos8s
- kayobe-seed-upgrade-ubuntu-focal
- kayobe-seed-vm-centos8s
- kayobe-seed-vm-rocky8
- kayobe-seed-vm-ubuntu-focal
- kayobe-seed-vm-ubuntu-jammy
- kayobe-infra-vm-centos8s
- kayobe-infra-vm-rocky8
- kayobe-infra-vm-ubuntu-focal
- kayobe-infra-vm-ubuntu-jammy
gate:
jobs:
@ -40,26 +40,26 @@
- kayobe-tox-molecule
- kayobe-overcloud-centos8s
- kayobe-overcloud-rocky8
- kayobe-overcloud-ubuntu-focal
- kayobe-overcloud-ubuntu-jammy
- kayobe-overcloud-tls-centos8s
- kayobe-overcloud-host-configure-centos8s
- kayobe-overcloud-host-configure-rocky8
- kayobe-overcloud-host-configure-ubuntu-focal
- kayobe-overcloud-host-configure-ubuntu-jammy
- kayobe-overcloud-upgrade-centos8s
- kayobe-overcloud-upgrade-ubuntu-focal
- kayobe-seed-centos8s
- kayobe-seed-rocky8
- kayobe-seed-ubuntu-focal
- kayobe-seed-ubuntu-jammy
- kayobe-seed-upgrade-centos8s
- kayobe-seed-upgrade-ubuntu-focal
- kayobe-seed-vm-centos8s
- kayobe-seed-vm-rocky8
- kayobe-seed-vm-ubuntu-focal
- kayobe-seed-vm-ubuntu-jammy
- kayobe-infra-vm-centos8s
- kayobe-infra-vm-rocky8
- kayobe-infra-vm-ubuntu-focal
- kayobe-infra-vm-ubuntu-jammy
experimental:
jobs:
- kayobe-seed-images-rocky8
- kayobe-seed-images-ubuntu-focal
- kayobe-seed-images-ubuntu-jammy