Skip to content

Commit 9eb4177

Browse files
authored
Merge pull request #488 from stackhpc/upstream/2025.1-2025-10-27
Synchronise 2025.1 with upstream
2 parents a9f8fb5 + 6a5514e commit 9eb4177

4 files changed

Lines changed: 9 additions & 4 deletions

File tree

ansible/inventory/group_vars/all/compute

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ compute_libvirt_enable_tls: false
240240
compute_libvirt_ceph_repo_install: true
241241

242242
# Ceph package repository release to install on CentOS and Rocky hosts when
243-
# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
244-
compute_libvirt_ceph_repo_release: pacific
243+
# compute_libvirt_ceph_repo_install is true. Default is 'squid'.
244+
compute_libvirt_ceph_repo_release: squid
245245

246246
###############################################################################
247247
# Compute node swap configuration.

doc/source/configuration/reference/hosts.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,7 @@ are relevant only when using the libvirt daemon rather than the
12371237
Default is ``true``.
12381238
``compute_libvirt_ceph_repo_release``
12391239
Ceph package repository release to install on CentOS and Rocky hosts when
1240-
``compute_libvirt_ceph_repo_install`` is ``true``. Default is ``pacific``.
1240+
``compute_libvirt_ceph_repo_install`` is ``true``. Default is ``squid``.
12411241

12421242
Example: custom libvirtd.conf
12431243
-----------------------------

etc/kayobe/compute.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
#compute_libvirt_ceph_repo_install:
210210

211211
# Ceph package repository release to install on CentOS and Rocky hosts when
212-
# compute_libvirt_ceph_repo_install is true. Default is 'pacific'.
212+
# compute_libvirt_ceph_repo_install is true. Default is 'squid'.
213213
#compute_libvirt_ceph_repo_release:
214214

215215
###############################################################################
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Bumps Ceph package repository to Squid. This repository is only configured
5+
when using host libvirt.

0 commit comments

Comments
 (0)