Skip to content

Commit

Permalink
Add Ceph package repo for Ubuntu Jammy
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex-Welsh committed Sep 25, 2024
1 parent 986657d commit 20ffb9c
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 0 deletions.
8 changes: 8 additions & 0 deletions etc/kayobe/apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ apt_config:
apt_keys:
- url: "https://download.docker.com/linux/ubuntu/gpg"
filename: docker.asc
- url: "https://download.ceph.com/keys/release.asc"
filename: ceph.asc

# A list of Apt repositories. Each item is a dict with the following keys:
# * types: whitespace-separated list of repository types, e.g. deb or deb-src
Expand Down Expand Up @@ -70,6 +72,12 @@ stackhpc_apt_repositories:
signed_by: docker.asc
architecture: amd64
required: true
- url: "{{ stackhpc_repo_ceph_reef_debian_url }}"
suites: "{{ ansible_facts.distribution_release }}"
components: main
signed_by: ceph.asc
architecture: amd64
required: true

# Do not replace apt configuration for non-overcloud hosts. This can result in
# errors if apt reconfiguration is performed before local repository mirrors
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-aio/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
stackhpc_repo_ceph_reef_debian_version: "{{ stackhpc_pulp_repo_ceph_reef_debian_version }}"
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-builder/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
stackhpc_repo_ceph_reef_debian_version: "{{ stackhpc_pulp_repo_ceph_reef_debian_version }}"
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/environments/ci-multinode/stackhpc-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
stackhpc_repo_ceph_reef_debian_version: "{{ stackhpc_pulp_repo_ceph_reef_debian_version }}"
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
Expand Down
1 change: 1 addition & 0 deletions etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240718T001130
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240911T063424
stackhpc_pulp_repo_ubuntu_jammy_version: 20240911T063424
stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
8 changes: 8 additions & 0 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ stackhpc_pulp_deb_repos:
components: "stable"
required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"

- name: "Docker CE for Ubuntu Jammy"
url: "{{ stackhpc_release_pulp_content_url }}/ceph/debian-reef/{{ stackhpc_pulp_repo_ceph_reef_debian_version }}"
distribution_name: "docker-ce-for-ubuntu-jammy-"
base_path: "docker-ce/ubuntu-jammy/"
distributions: "jammy"
components: "stable"
required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"

# Publication format is a subset of distribution.
stackhpc_pulp_publication_deb_development: "{{ stackhpc_pulp_distribution_deb_development }}"

Expand Down
4 changes: 4 additions & 0 deletions etc/kayobe/stackhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_repo_distribution }}"
stackhpc_repo_docker_ce_ubuntu_jammy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/ubuntu-jammy/{{ stackhpc_repo_docker_ce_ubuntu_jammy_version }}"
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_repo_distribution }}"

# Ceph Reef for Debian
stackhpc_repo_ceph_reef_debian_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ceph/debian-reef/{{ stackhpc_repo_ceph_reef_debian_version }}"
stackhpc_repo_ceph_reef_debian_version: "{{ stackhpc_repo_distribution }}"

###############################################################################
# RPMs

Expand Down

0 comments on commit 20ffb9c

Please sign in to comment.