openstack
/
puppet-ceph
Code Issues Proposed changes

repo: Fix undefined $el 

This fixes the undefined $el variable when epel is enabled but sig
repository is used.

Change-Id: Ib7f0954413d2a5727e5eaf457da544c48a14ff6b
This commit is contained in:
Takashi Kajinami 2023-07-20 15:14:34 +09:00
parent 8bc67e20e7
commit 0d77c3353b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/repo.pp
View File

@ -119,6 +119,8 @@ class ceph::repo (
}
'RedHat': {
$el = $facts['os']['release']['major']
# If you want to deploy Ceph using packages provided by CentOS SIG
# https://wiki.centos.org/SpecialInterestGroup/Storage/
if $enable_sig {
@ -131,14 +133,14 @@ not on ${facts['os']['name']}, which can lead to packaging issues.")
} else {
# NOTE(tobias-urdin): mirror.centos.org doesnt have https support
if $stream {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
if versioncmp($el, '9') >= 0 {
$centos_mirror = 'mirror.stream.centos.org/SIGs'
} else {
$centos_mirror = 'mirror.centos.org/centos'
}
$ceph_mirror_real = "http://${centos_mirror}/${facts['os']['release']['major']}-stream/storage/x86_64/ceph-${release}/"
$ceph_mirror_real = "http://${centos_mirror}/${el}-stream/storage/x86_64/ceph-${release}/"
} else {
$ceph_mirror_real = "http://mirror.centos.org/centos/${facts['os']['release']['major']}/storage/x86_64/ceph-${release}/"
$ceph_mirror_real = "http://mirror.centos.org/centos/${el}/storage/x86_64/ceph-${release}/"
}
}
yumrepo { 'ceph-storage-sig':
@ -152,8 +154,6 @@ not on ${facts['os']['name']}, which can lead to packaging issues.")
Yumrepo['ceph-storage-sig'] -> Package<| tag == 'ceph' |>
} else {
# If you want to deploy Ceph using packages provided by ceph.com repositories.
$el = $facts['os']['release']['major']
Yumrepo {
proxy => $proxy,
proxy_username => $proxy_username,

4
spec/classes/ceph_repo_spec.rb
View File

@ -427,7 +427,8 @@ describe 'ceph::repo' do
context 'when using CentOS SIG repository' do
let :params do
{
:enable_sig => true,
:enable_sig => true,
:enable_epel => false,
}
end
@ -444,6 +445,7 @@ describe 'ceph::repo' do
let :params do
{
:enable_sig => true,
:enable_epel => false,
:ceph_mirror => 'https://mymirror/luminous/',
}
end