Skip to content

Add Ubuntu Jammy Support #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/source/configuration/cephadm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions etc/kayobe/apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
7 changes: 5 additions & 2 deletions etc/kayobe/cephadm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/ceph-quincy-e110f3ba270c3a52.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
Automatically install Quincy if the node is running Ubuntu 22.04, else install Pacific.
8 changes: 8 additions & 0 deletions releasenotes/notes/ubuntu-jammy-cd109d12954d7626.yaml
Original file line number Diff line number Diff line change
@@ -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.