openstack/puppet-ceph
Code Issues Proposed changes

Merge "Fix CentOS Storage SIG mirror URL"

Browse Source
This commit is contained in:
Zuul 2020-05-13 08:10:59 +00:00 committed by Gerrit Code Review
commit bebe577e70
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/repo.pp
View File

@ -127,7 +127,8 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
if $ceph_mirror { if $ceph_mirror {
$ceph_mirror_real = $ceph_mirror $ceph_mirror_real = $ceph_mirror
} else { } else {
$ceph_mirror_real = "https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-${release}/" # NOTE(tobias-urdin): mirror.centos.org doesnt have https support
$ceph_mirror_real = "http://mirror.centos.org/centos/${::operatingsystemmajrelease}/storage/x86_64/ceph-${release}/"
} }
yumrepo { 'ceph-luminous-sig': yumrepo { 'ceph-luminous-sig':
ensure => 'absent', ensure => 'absent',

2
spec/classes/ceph_repo_spec.rb
View File

@ -505,7 +505,7 @@ describe 'ceph::repo' do
it { should contain_yumrepo('ceph-luminous-sig').with_ensure('absent') } it { should contain_yumrepo('ceph-luminous-sig').with_ensure('absent') }
it { should contain_yumrepo('ceph-storage-sig').with( it { should contain_yumrepo('ceph-storage-sig').with(
:baseurl => 'https://buildlogs.centos.org/centos/7/storage/x86_64/ceph-nautilus/', :baseurl => 'http://mirror.centos.org/centos/7/storage/x86_64/ceph-nautilus/',
)} )}
end end