Add support for Ubuntu Jammy Jellyfish (22.04) LTS

Co-Authored-By: Bartosz Bezak <[email protected]> Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/869127 Change-Id: I06a3e9922cf95979f3bca120cd82633046270fa3 (cherry picked from commit ebf8cfc)
stackhpc · Jan 10, 2023 · 56cfe14 · 56cfe14
1 parent 089094c
commit 56cfe14
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 21 deletions.
diff --git a/ansible/roles/apt/tasks/repos.yml b/ansible/roles/apt/tasks/repos.yml
@@ -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

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
@@ -18,6 +18,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 Yoga 12.8.0 release)
 
 See the :doc:`support matrix <support-matrix>` for details of supported
 Operating Systems for other hosts.

diff --git a/doc/source/support-matrix.rst b/doc/source/support-matrix.rst
@@ -12,6 +12,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 Yoga 12.8.0 release)
 
 .. note::
 
@@ -26,6 +27,11 @@ Kayobe supports the following host Operating Systems (OS):
    host OS. The Victoria release supports both CentOS Linux 8 and CentOS Stream
    8, and provides a route for migration.
 
+.. note::
+
+   Ubuntu Jammy support requires setting ``os_distro`` in
+   ``etc/kayobe/globals.yml`` to ``jammy``.
+
 Supported container images
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
@@ -50,8 +50,8 @@
 #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
-# "ubuntu".
+# "8" when os_distribution is "rocky", or "focal" and "jammy" when
+# os_distribution is "ubuntu".
 #os_release:
 
 ###############################################################################

diff --git a/playbooks/kayobe-overcloud-base/globals.yml.j2 b/playbooks/kayobe-overcloud-base/globals.yml.j2
@@ -1,4 +1,8 @@
 ---
+{% if ansible_facts.distribution_release == "jammy" %}
+os_release: "jammy"
+{% endif %}
+
 # Use HTTPS opendev quay.io registry proxy.
 docker_registry_insecure: no
 

diff --git a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2
@@ -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 {{ ansible_distribution_release }} repositories.
   - url: "http://{{ zuul_site_mirror_fqdn }}/ubuntu/"
-    suites: focal focal-updates
+    suites: {{ ansible_distribution_release }} {{ ansible_distribution_release }}-updates
     components: main restricted universe multiverse
   - url: "http://{{ zuul_site_mirror_fqdn }}/ubuntu/"
-    suites: focal-security
+    suites: {{ ansible_distribution_release }}-security
     components: main restricted universe multiverse
   # Treasuredata repository.
-  - url:  http://packages.treasuredata.com/4/ubuntu/focal/
+  - url:  http://packages.treasuredata.com/4/ubuntu/{{ ansible_distribution_release }}/
     components: contrib
     signed_by: td-agent.asc
 apt_disable_sources_list: true

diff --git a/releasenotes/notes/ubuntu-jammy-515047cd1ae85151.yaml b/releasenotes/notes/ubuntu-jammy-515047cd1ae85151.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds support for Ubuntu Jammy Jellyfish (22.04) LTS as a host
+    Operating System for seed, seed hypervisor and overcloud hosts.
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -125,6 +125,11 @@
     parent: kayobe-overcloud-base
     nodeset: kayobe-ubuntu-focal
 
+- job:
+    name: kayobe-overcloud-ubuntu-jammy
+    parent: kayobe-overcloud-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-overcloud-tls-base
     parent: kayobe-overcloud-base
@@ -187,6 +192,11 @@
     parent: kayobe-seed-base
     nodeset: kayobe-ubuntu-focal
 
+- job:
+    name: kayobe-seed-ubuntu-jammy
+    parent: kayobe-seed-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-seed-images-base
     parent: kayobe-seed-base
@@ -213,6 +223,11 @@
     parent: kayobe-seed-images-base
     nodeset: kayobe-ubuntu-focal
 
+- job:
+    name: kayobe-seed-images-ubuntu-jammy
+    parent: kayobe-seed-images-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-overcloud-host-configure-base
     parent: kayobe-overcloud-base
@@ -239,6 +254,11 @@
     parent: kayobe-overcloud-host-configure-base
     nodeset: kayobe-ubuntu-focal
 
+- job:
+    name: kayobe-overcloud-host-configure-ubuntu-jammy
+    parent: kayobe-overcloud-host-configure-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-seed-upgrade-base
     parent: kayobe-base
@@ -288,6 +308,11 @@
     parent: kayobe-seed-vm-base
     nodeset: kayobe-ubuntu-focal
 
+- job:
+    name: kayobe-seed-vm-ubuntu-jammy
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-ubuntu-jammy
+
 - job:
     name: kayobe-infra-vm-base
     parent: kayobe-base
@@ -314,3 +339,8 @@
     name: kayobe-infra-vm-ubuntu-focal
     parent: kayobe-infra-vm-base
     nodeset: kayobe-ubuntu-focal
+
+- job:
+    name: kayobe-infra-vm-ubuntu-jammy
+    parent: kayobe-infra-vm-base
+    nodeset: kayobe-ubuntu-jammy
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
@@ -17,3 +17,9 @@
     nodes:
       - name: primary
         label: ubuntu-focal
+
+- nodeset:
+    name: kayobe-ubuntu-jammy
+    nodes:
+      - name: primary
+        label: ubuntu-jammy
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
@@ -11,27 +11,17 @@
         - kayobe-tox-ansible-syntax
         - kayobe-tox-ansible
         - kayobe-tox-molecule
-        - kayobe-overcloud-centos8s
-        - kayobe-overcloud-rocky8
         - kayobe-overcloud-ubuntu-focal
-        - kayobe-overcloud-tls-centos8s
-        - kayobe-overcloud-host-configure-centos8s
-        - kayobe-overcloud-host-configure-rocky8
+        - kayobe-overcloud-ubuntu-jammy
         - kayobe-overcloud-host-configure-ubuntu-focal
-        - kayobe-overcloud-upgrade-centos8s
+        - kayobe-overcloud-host-configure-ubuntu-jammy
         - kayobe-overcloud-upgrade-ubuntu-focal
-        - kayobe-seed-centos8s
-        - kayobe-seed-rocky8
         - kayobe-seed-ubuntu-focal
-        - kayobe-seed-images-centos8s
-        - kayobe-seed-upgrade-centos8s
-        - kayobe-seed-upgrade-ubuntu-focal
-        - kayobe-seed-vm-centos8s
-        - kayobe-seed-vm-rocky8
+        - kayobe-seed-ubuntu-jammy
         - kayobe-seed-vm-ubuntu-focal
-        - kayobe-infra-vm-centos8s
-        - kayobe-infra-vm-rocky8
+        - kayobe-seed-vm-ubuntu-jammy
         - kayobe-infra-vm-ubuntu-focal
+        - kayobe-infra-vm-ubuntu-jammy
 
     gate:
       jobs:
@@ -41,25 +31,31 @@
         - 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