Merge pull request #1486 from stackhpc/squidmaster

Master: switch from Reef to Squid

Author: Alex-Welsh

doc/source/conf.py

@@ -32,7 +32,7 @@
 current_series = "2024.1"
 previous_series = "2023.1"
 branch = f"stackhpc/{current_series}"
-ceph_series = "reef"
+ceph_series = "squid"
 
 # Substitutions loader
 rst_prolog = """

doc/source/configuration/cephadm.rst

@@ -19,8 +19,8 @@ create or modify Ceph cluster deployments. Supported features are:
 Resources
 =========
 
--  https://docs.ceph.com/en/reef/cephadm/index.html
--  https://docs.ceph.com/en/reef/
+-  https://docs.ceph.com/en/squid/cephadm/index.html
+-  https://docs.ceph.com/en/squid/
 -  https://github.com/stackhpc/ansible-collection-cephadm
 
 Configuration

etc/kayobe/apt.yml

@@ -33,8 +33,6 @@ 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

etc/kayobe/cephadm.yml

@@ -3,7 +3,7 @@
 # Cephadm deployment configuration.
 
 # Ceph release name.
-cephadm_ceph_release: "reef"
+cephadm_ceph_release: "squid"
 
 # Ceph FSID.
 #cephadm_fsid:
@@ -12,7 +12,7 @@ cephadm_ceph_release: "reef"
 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: "v18.2.4"
+cephadm_image_tag: "v19.2.0"
 
 # HAProxy container image.
 cephadm_haproxy_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/haproxy:{{ cephadm_haproxy_image_tag }}"

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -32,7 +32,7 @@ stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_u
 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 }}"
-stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
 stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -58,7 +58,7 @@ stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_u
 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 }}"
-stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
 stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

@@ -32,7 +32,7 @@ stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_u
 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 }}"
-stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
 stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
 stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"

etc/kayobe/kolla.yml

@@ -210,9 +210,9 @@ stackhpc_rocky_9_third_party_repos:
   - url: "{{ stackhpc_repo_rhel_9_influxdb_url }}"
     file: "influxdb.repo"
     tag: "influxdb"
-  - url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_url }}"
-    file: "CentOS-Ceph-Reef.repo"
-    tag: "centos-ceph-reef"
+  - url: "{{ stackhpc_repo_centos_stream_9_storage_ceph_squid_url }}"
+    file: "CentOS-Ceph-Squid.repo"
+    tag: "centos-ceph-squid"
   - url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
     file: "rabbitmq_rabbitmq-erlang.repo"
     tag: "rabbitmq_rabbitmq-erlang"

etc/kayobe/pulp-repo-versions.yml

@@ -5,8 +5,7 @@ stackhpc_pulp_repo_centos_stream_9_docker_version: 20241210T000909
 stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20241214T012909
 stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20241212T022636
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
-stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240923T233036
-stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
+stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20240923T233036
 stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20241218T154614
 stackhpc_pulp_repo_elrepo_9_version: 20241129T235743
 stackhpc_pulp_repo_epel_9_version: 20241216T235733

etc/kayobe/pulp.yml

@@ -297,10 +297,10 @@ stackhpc_pulp_rpm_repos:
     base_path: "centos/9-stream/opstools/x86_64/collectd-5/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
-  - name: CentOS Stream 9 - Ceph Reef
-    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/storage/x86_64/ceph-reef/{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
-    distribution_name: "centos-stream-9-ceph-reef-"
-    base_path: "centos/9-stream/storage/x86_64/ceph-reef/"
+  - name: CentOS Stream 9 - Ceph Squid
+    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/storage/x86_64/ceph-squid/{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
+    distribution_name: "centos-stream-9-ceph-squid-"
+    base_path: "centos/9-stream/storage/x86_64/ceph-squid/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
   # EPEL 9 repository

etc/kayobe/stackhpc.yml

@@ -72,9 +72,9 @@ stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_repo_distr
 stackhpc_repo_centos_stream_9_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS Stream 9 - Ceph Reef
-stackhpc_repo_centos_stream_9_storage_ceph_reef_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/storage/x86_64/ceph-reef/{{ stackhpc_repo_centos_stream_9_storage_ceph_reef_version }}"
-stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_repo_distribution }}"
+# CentOS Stream 9 - Ceph Squid
+stackhpc_repo_centos_stream_9_storage_ceph_squid_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/storage/x86_64/ceph-squid/{{ stackhpc_repo_centos_stream_9_storage_ceph_squid_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 Docker CE
 stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/centos/9/x86_64/stable/{{ stackhpc_repo_centos_stream_9_docker_version }}"

releasenotes/notes/ceph-squid-1f83652e6ad23b55.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Added support for the Squid release of Ceph.
+upgrade:
+  - |
+    Squid has become the default release of Ceph. The new default image tag is
+    ``v19.2.0``.