From cdfbfde15bb144a0c6487503cd304d5140444913 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 8 May 2020 16:40:03 +0200 Subject: [PATCH] Fix CentOS Storage SIG mirror URL The mirror URL is hardcoded to buildslogs for CentOS 7 and should be mirror with proper fact usage. Change-Id: Iedf2e77d08c5e5c15268472f7acaa9ea7885c92c --- manifests/repo.pp | 3 ++- spec/classes/ceph_repo_spec.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index 736f0374..ec1d1b70 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -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', diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb index 170e7c97..b6eaa5fe 100644 --- a/spec/classes/ceph_repo_spec.rb +++ b/spec/classes/ceph_repo_spec.rb @@ -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