Skip to content

Synchronise 2024.1 with upstream #586

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.

Sign up for GitHub

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
bbezak merged 1 commit into from
Aug 27, 2026
Merged

Synchronise 2024.1 with upstream #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion doc/source/ceph_versions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Distro,Ceph,
,Source, Release
Rocky Linux,CentOS Storage SIG,Reef
Rocky Linux,download.ceph.com,Squid
Ubuntu,Ubuntu,Reef
Debian,Debian,Pacific
6 changes: 6 additions & 0 deletions docker/base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ COPY dnf.conf /etc/dnf/dnf.conf
'td.repo',
] %}

# NOTE(bbezak): The CentOS Storage SIG only built Ceph Squid 19.2.5 for el9,
# which misses the 19.2.6 CVE fixes, so get Ceph from download.ceph.com here.
{% set base_yum_repo_files = base_yum_repo_files + [
'ceph.repo',
] %}

{% set base_yum_url_packages = [
] %}

Expand Down
6 changes: 6 additions & 0 deletions docker/base/ceph.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[ceph-squid]
name = Ceph Squid
baseurl = https://download.ceph.com/rpm-squid/el9/$basearch
gpgcheck = 1
enabled = 0
gpgkey = https://download.ceph.com/keys/release.asc
8 changes: 4 additions & 4 deletions kolla/template/repos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
centos:
ceph: "centos-ceph-reef"
ceph: "ceph-squid"
crb: "crb"
epel: "epel"
erlang: "rabbitmq_rabbitmq-erlang"
Expand All @@ -18,7 +18,7 @@ centos:
rabbitmq: "rabbitmq_rabbitmq-server"

centos-aarch64:
ceph: "centos-ceph-reef"
ceph: "ceph-squid"
crb: "crb"
epel: "epel"
erlang-26: "copr-rabbitmq-erlang-26"
Expand Down Expand Up @@ -147,7 +147,7 @@ debian-aarch64:
gpg_key: "rabbitmq.gpg"

rocky:
ceph: "centos-ceph-reef"
ceph: "ceph-squid"
crb: "crb"
epel: "epel"
erlang: "rabbitmq_rabbitmq-erlang"
Expand All @@ -165,7 +165,7 @@ rocky:
rabbitmq: "rabbitmq_rabbitmq-server"

rocky-aarch64:
ceph: "centos-ceph-reef"
ceph: "ceph-squid"
crb: "crb"
epel: "epel"
erlang-26: "copr-rabbitmq-erlang-26"
Expand Down
4 changes: 2 additions & 2 deletions kolla/tests/test_methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_enable_repos_centos_multiple(self):
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
'enable')
expectCmd = 'RUN dnf config-manager --enable grafana '
expectCmd += '--enable centos-ceph-reef || true'
expectCmd += '--enable ceph-squid || true'
self.assertEqual(expectCmd, result)

def test_enable_repos_debian(self):
Expand Down Expand Up @@ -167,7 +167,7 @@ def test_disable_repos_centos_multiple(self):
result = methods.handle_repos(template_vars, ['grafana', 'ceph'],
'disable')
expectCmd = 'RUN dnf config-manager --disable grafana '
expectCmd += '--disable centos-ceph-reef || true'
expectCmd += '--disable ceph-squid || true'
self.assertEqual(expectCmd, result)

# NOTE(hrw): there is no disabling of repos for Debian/Ubuntu
Expand Down
14 changes: 14 additions & 0 deletions releasenotes/notes/ceph-squid-el9-3f1d7a0c95b4e28d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
security:
- |
Ceph in Rocky Linux 9 and CentOS Stream 9 images is updated from Reef
18.2.8 to Squid 19.2.6. This fixes CVE-2025-30156, CVE-2026-39944,
CVE-2026-50152 and CVE-2026-54330. The packages come from
download.ceph.com, because the CentOS Storage SIG only built Squid 19.2.5
for el9.
upgrade:
- |
On Rocky Linux 9 and CentOS Stream 9 the Ceph repository is now
``ceph-squid`` at ``https://download.ceph.com/rpm-squid/el9``, and no
longer ``centos-ceph-reef``. If you mirror repositories, add a mirror of
the new one and use the new name.