Skip to content

Commit 6a5a1ab

Browse files
committed
Caracal: Bump default Ceph version to Reef
Also bump haproxy and keepalived container images used for Ceph RADOS Gateway ingress.
1 parent 4228bad commit 6a5a1ab

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

doc/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
current_series = "2024.1"
3333
previous_series = "2023.1"
3434
branch = f"stackhpc/{current_series}"
35-
ceph_series = "quincy"
35+
ceph_series = "reef"
3636

3737
# Substitutions loader
3838
rst_prolog = """

doc/source/configuration/cephadm.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ create or modify Ceph cluster deployments. Supported features are:
1919
Resources
2020
=========
2121

22-
- https://docs.ceph.com/en/quincy/cephadm/index.html
23-
- https://docs.ceph.com/en/quincy/
2422
- https://docs.ceph.com/en/reef/cephadm/index.html
2523
- https://docs.ceph.com/en/reef/
2624
- https://github.com/stackhpc/ansible-collection-cephadm

etc/kayobe/cephadm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Cephadm deployment configuration.
44

55
# Ceph release name.
6-
cephadm_ceph_release: "quincy"
6+
cephadm_ceph_release: "reef"
77

88
# Ceph FSID.
99
#cephadm_fsid:
@@ -12,7 +12,7 @@ cephadm_ceph_release: "quincy"
1212
cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}"
1313

1414
# Ceph container image tag.
15-
cephadm_image_tag: "v17.2.7"
15+
cephadm_image_tag: "v18.2.4"
1616

1717
# Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy.
1818
cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}"
@@ -21,13 +21,13 @@ cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}"
2121
cephadm_haproxy_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/haproxy:{{ cephadm_haproxy_image_tag }}"
2222

2323
# HAProxy container image tag.
24-
cephadm_haproxy_image_tag: "2.3"
24+
cephadm_haproxy_image_tag: "2.6"
2525

2626
# Keepalived container image.
2727
cephadm_keepalived_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/keepalived:{{ cephadm_keepalived_image_tag }}"
2828

2929
# Keepalived container image tag.
30-
cephadm_keepalived_image_tag: "2.1.5"
30+
cephadm_keepalived_image_tag: "2.2.4"
3131

3232
# Ceph container image registry URL.
3333
cephadm_registry_url: "{{ stackhpc_docker_registry }}"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
upgrade:
3+
- |
4+
Updates the default version of Ceph to Reef. The following container tags
5+
are used for Ceph:
6+
7+
- ``ceph``: ``v18.2.4``
8+
- ``haproxy``: ``2.6``
9+
- ``keepalived``: ``2.2.4``

0 commit comments

Comments
 (0)