From 99fcb3b406e24c4ce2021abacc66e3ff3e5e793b Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Thu, 11 May 2023 17:50:04 +0100 Subject: [PATCH 1/4] Disable pulling from pulp for Jammy --- etc/kayobe/apt.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index 657ee2b13..2b2297855 100644 --- a/etc/kayobe/apt.yml +++ b/etc/kayobe/apt.yml @@ -47,7 +47,7 @@ apt_keys: # * architecture: whitespace-separated list of architectures that will be used # (optional, default is unset) # Default is an empty list. -apt_repositories: +stackhpc_apt_repositories: - url: "{{ stackhpc_repo_ubuntu_focal_url }}" suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports" components: main restricted universe multiverse @@ -62,10 +62,13 @@ apt_repositories: signed_by: docker.asc architecture: amd64 +# Disable pulp apt repos on Ubuntu Jammy until they are published. +apt_repositories: "{{ [] if ansible_facts['distribution_release'] == 'jammy' else stackhpc_apt_repositories }}" + # Whether to disable repositories in /etc/apt/sources.list. This may be used # when replacing the distribution repositories via apt_repositories. # Default is false. -apt_disable_sources_list: true +apt_disable_sources_list: "{{ ansible_facts['distribution_release'] != 'jammy' }}" ############################################################################### # Dummy variable to allow Ansible to accept this file. From 3a74269b8b86521c8362821814b70420b2648498 Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Thu, 27 Apr 2023 19:18:28 +0100 Subject: [PATCH 2/4] Change network interface for jammy to ens3 --- .../ci-multinode/inventory/group_vars/seed/network-interfaces | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/network-interfaces b/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/network-interfaces index a918946eb..76abbfa00 100644 --- a/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/network-interfaces +++ b/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/network-interfaces @@ -2,7 +2,7 @@ ############################################################################### # Network interface definitions for the seed group. -admin_oc_interface: "{{ 'ens2' if os_distribution == 'ubuntu' else 'ens3' }}" +admin_oc_interface: "{{ 'ens2' if (os_distribution == 'ubuntu' and ansible_facts['distribution_release'] != 'jammy') else 'ens3' }}" provision_oc_interface: "{{ vxlan_interfaces[0].device}}.{{ provision_oc_vlan }}" From 469cc0dc84c738dd170320cdf64b20b64b75be72 Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Thu, 11 May 2023 17:44:37 +0100 Subject: [PATCH 3/4] Use Quincy for Ubuntu 22.04 --- doc/source/configuration/cephadm.rst | 2 ++ etc/kayobe/cephadm.yml | 7 +++++-- releasenotes/notes/ceph-quincy-e110f3ba270c3a52.yaml | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/ceph-quincy-e110f3ba270c3a52.yaml diff --git a/doc/source/configuration/cephadm.rst b/doc/source/configuration/cephadm.rst index 8908b351f..edbdf55e8 100644 --- a/doc/source/configuration/cephadm.rst +++ b/doc/source/configuration/cephadm.rst @@ -21,6 +21,8 @@ Resources - https://docs.ceph.com/en/pacific/cephadm/index.html - https://docs.ceph.com/en/pacific/ +- https://docs.ceph.com/en/quincy/cephadm/index.html +- https://docs.ceph.com/en/quincy/ - https://github.com/stackhpc/ansible-collection-cephadm Configuration diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index ae2e4d666..59ee20d66 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -3,7 +3,7 @@ # Cephadm deployment configuration. # Ceph release name. -cephadm_ceph_release: "pacific" +cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') else 'pacific' }}" # Ceph FSID. #cephadm_fsid: @@ -12,7 +12,10 @@ cephadm_ceph_release: "pacific" cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}" # Ceph container image tag. -cephadm_image_tag: "v16.2.11" +cephadm_image_tag: "{{ 'v17.2.6' if ansible_facts['distribution_release'] == 'jammy' else 'v16.2.11' }}" + +# Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy. +cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}" # Ceph container image registry URL. cephadm_registry_url: "{{ stackhpc_docker_registry }}" diff --git a/releasenotes/notes/ceph-quincy-e110f3ba270c3a52.yaml b/releasenotes/notes/ceph-quincy-e110f3ba270c3a52.yaml new file mode 100644 index 000000000..366f5dd81 --- /dev/null +++ b/releasenotes/notes/ceph-quincy-e110f3ba270c3a52.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Automatically install Quincy if the node is running Ubuntu 22.04, else install Pacific. From 3cd22284dd632f1d404017f03027d88084505261 Mon Sep 17 00:00:00 2001 From: technowhizz <7688823+technowhizz@users.noreply.github.com> Date: Tue, 16 May 2023 17:01:36 +0100 Subject: [PATCH 4/4] Add release note --- releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml diff --git a/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml b/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml new file mode 100644 index 000000000..2219bf37f --- /dev/null +++ b/releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + Dont pull apt packages from pulp for Ubuntu Jammy until Jammy packages + are published. + - | + Dont pull ceph packages from ceph official repos for Ubuntu Jammy until + Jammy packages are published.