CentOS: Allow fixing repository url for CentOS Stream
URL of SIG repository is different between CentOS and CentOS Stream. ('-stream' prefixes major version) This change introduces the `stream` parameter which we already added to openstack_extras so that users can use the correct repository without defining the whole url by ceph_mirror. Change-Id: Ibfb4cc4df52cd1318a5497e2ea02c2ca0893331f
This commit is contained in:
parent
92da9357b3
commit
e13544a6df
@ -56,6 +56,9 @@
|
|||||||
# https://wiki.centos.org/SpecialInterestGroup/Storage/
|
# https://wiki.centos.org/SpecialInterestGroup/Storage/
|
||||||
# Optional. Defaults to False in ceph::params.
|
# Optional. Defaults to False in ceph::params.
|
||||||
#
|
#
|
||||||
|
# [*stream*] Whether this is CentOS Stream or not. This parameter is used in CentOS only.
|
||||||
|
# Optional. Defaults to False.
|
||||||
|
#
|
||||||
# [*ceph_mirror*] Ceph mirror used to download packages.
|
# [*ceph_mirror*] Ceph mirror used to download packages.
|
||||||
# Optional. Defaults to undef.
|
# Optional. Defaults to undef.
|
||||||
#
|
#
|
||||||
@ -68,6 +71,7 @@ class ceph::repo (
|
|||||||
$proxy_password = undef,
|
$proxy_password = undef,
|
||||||
$enable_epel = true,
|
$enable_epel = true,
|
||||||
$enable_sig = $ceph::params::enable_sig,
|
$enable_sig = $ceph::params::enable_sig,
|
||||||
|
$stream = false,
|
||||||
$ceph_mirror = undef,
|
$ceph_mirror = undef,
|
||||||
) inherits ceph::params {
|
) inherits ceph::params {
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
@ -128,8 +132,12 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
|
|||||||
$ceph_mirror_real = $ceph_mirror
|
$ceph_mirror_real = $ceph_mirror
|
||||||
} else {
|
} else {
|
||||||
# NOTE(tobias-urdin): mirror.centos.org doesnt have https support
|
# NOTE(tobias-urdin): mirror.centos.org doesnt have https support
|
||||||
|
if $stream {
|
||||||
|
$ceph_mirror_real = "http://mirror.centos.org/centos/${::operatingsystemmajrelease}-stream/storage/x86_64/ceph-${release}/"
|
||||||
|
} else {
|
||||||
$ceph_mirror_real = "http://mirror.centos.org/centos/${::operatingsystemmajrelease}/storage/x86_64/ceph-${release}/"
|
$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',
|
||||||
}
|
}
|
||||||
|
5
releasenotes/notes/centos-stream-a43a0bbe65cf2aa8.yaml
Normal file
5
releasenotes/notes/centos-stream-a43a0bbe65cf2aa8.yaml
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``ceph::repo::stream`` parameter has been added. Set this parameter
|
||||||
|
to ``true`` when CentOS Stream and SIG repository are used.
|
@ -509,6 +509,24 @@ describe 'ceph::repo' do
|
|||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when using CentOS SIG repository and CentOS Stream' do
|
||||||
|
let :params do
|
||||||
|
{
|
||||||
|
:enable_sig => true,
|
||||||
|
:stream => true,
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
it { should_not contain_yumrepo('ext-epel-8') }
|
||||||
|
it { should_not contain_yumrepo('ext-ceph') }
|
||||||
|
it { should_not contain_yumrepo('ext-ceph-noarch') }
|
||||||
|
it { should contain_yumrepo('ceph-luminous-sig').with_ensure('absent') }
|
||||||
|
|
||||||
|
it { should contain_yumrepo('ceph-storage-sig').with(
|
||||||
|
:baseurl => 'http://mirror.centos.org/centos/8-stream/storage/x86_64/ceph-nautilus/',
|
||||||
|
)}
|
||||||
|
end
|
||||||
|
|
||||||
context 'when using CentOS SIG repository from a mirror' do
|
context 'when using CentOS SIG repository from a mirror' do
|
||||||
let :params do
|
let :params do
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user