Browse Source

Merge "Fix CentOS Storage SIG mirror URL"

tags/3.1.1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
bebe577e70
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      manifests/repo.pp
  2. +1
    -1
      spec/classes/ceph_repo_spec.rb

+ 2
- 1
manifests/repo.pp View File

@@ -127,7 +127,8 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
if $ceph_mirror {
$ceph_mirror_real = $ceph_mirror
} 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':
ensure => 'absent',


+ 1
- 1
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-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



Loading…
Cancel
Save