openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Use https for CentOS Stream 9 mirror"

This commit is contained in:
Zuul 2023-07-27 10:52:40 +00:00 committed by Gerrit Code Review
parent f5bd05d31e 90cc5ee1ac
commit 68ece8d8f4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/repo.pp
View File

@ -134,11 +134,11 @@ not on ${facts['os']['name']}, which can lead to packaging issues.")
# NOTE(tobias-urdin): mirror.centos.org doesnt have https support
if $stream {
if versioncmp($el, '9') >= 0 {
$centos_mirror = 'mirror.stream.centos.org/SIGs'
$centos_mirror = 'https://mirror.stream.centos.org/SIGs'
} else {
$centos_mirror = 'mirror.centos.org/centos'
$centos_mirror = 'http://mirror.centos.org/centos'
}
$ceph_mirror_real = "http://${centos_mirror}/${el}-stream/storage/x86_64/ceph-${release}/"
$ceph_mirror_real = "${centos_mirror}/${el}-stream/storage/x86_64/ceph-${release}/"
} else {
$ceph_mirror_real = "http://mirror.centos.org/centos/${el}/storage/x86_64/ceph-${release}/"
}

2
spec/classes/ceph_repo_spec.rb
View File

@ -596,7 +596,7 @@ describe 'ceph::repo' do
end
it { should contain_yumrepo('ceph-storage-sig').with(
:baseurl => 'http://mirror.stream.centos.org/SIGs/9-stream/storage/x86_64/ceph-nautilus/',
:baseurl => 'https://mirror.stream.centos.org/SIGs/9-stream/storage/x86_64/ceph-nautilus/',
)}
end
end