openstack
/
puppet-ceph
Code Issues Proposed changes

Drop Fedora support 

Fedora support is never tested, and has been unmaintained for a while.
Because we don't expect any actual user using OpenStack on Fedora, this
change drops support for Fedora directly.

This change also fixes the release version used in CentOS8/RHEL8 when
setting up package repositories.

Change-Id: I541a57bf4bdb51d1d27ff25e317683e3dbb56afa
This commit is contained in:
zhangboye 2021-06-12 15:36:22 +08:00 committed by Takashi Kajinami
parent ffa80daae8
commit 6edfc34ed7
5 changed files with 115 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
manifests/repo.pp
View File

@ -144,12 +144,7 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
Yumrepo['ceph-luminous-sig'] -> Yumrepo['ceph-storage-sig'] -> Package<| tag == 'ceph' |>
} else {
# If you want to deploy Ceph using packages provided by ceph.com repositories.
if ((($::operatingsystem == 'RedHat' or $::operatingsystem == 'CentOS') and (versioncmp($::operatingsystemmajrelease, '7') < 0))
or ($::operatingsystem == 'Fedora' and (versioncmp($::operatingsystemmajrelease, '19') < 0))) {
$el = '6'
} else {
$el = '7'
}
$el = $::operatingsystemmajrelease
Yumrepo {
proxy => $proxy,
@ -158,45 +153,43 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
}
if ($::operatingsystem != 'Fedora') {
yumrepo { 'ext-ceph':
# puppet versions prior to 3.5 do not support ensure, use enabled instead
enabled => $enabled,
descr => "External Ceph ${release}",
name => "ext-ceph-${release}",
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/\$basearch",
gpgcheck => '1',
gpgkey => 'https://download.ceph.com/keys/release.asc',
mirrorlist => absent,
priority => '10', # prefer ceph repos over EPEL
tag => 'ceph',
}
yumrepo { 'ext-ceph':
# puppet versions prior to 3.5 do not support ensure, use enabled instead
enabled => $enabled,
descr => "External Ceph ${release}",
name => "ext-ceph-${release}",
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/\$basearch",
gpgcheck => '1',
gpgkey => 'https://download.ceph.com/keys/release.asc',
mirrorlist => absent,
priority => '10', # prefer ceph repos over EPEL
tag => 'ceph',
}
yumrepo { 'ext-ceph-noarch':
# puppet versions prior to 3.5 do not support ensure, use enabled instead
enabled => $enabled,
descr => 'External Ceph noarch',
name => "ext-ceph-${release}-noarch",
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/noarch",
gpgcheck => '1',
gpgkey => 'https://download.ceph.com/keys/release.asc',
mirrorlist => absent,
priority => '10', # prefer ceph repos over EPEL
tag => 'ceph',
}
yumrepo { 'ext-ceph-noarch':
# puppet versions prior to 3.5 do not support ensure, use enabled instead
enabled => $enabled,
descr => 'External Ceph noarch',
name => "ext-ceph-${release}-noarch",
baseurl => "http://download.ceph.com/rpm-${release}/el${el}/noarch",
gpgcheck => '1',
gpgkey => 'https://download.ceph.com/keys/release.asc',
mirrorlist => absent,
priority => '10', # prefer ceph repos over EPEL
tag => 'ceph',
}
if $fastcgi {
yumrepo { 'ext-ceph-fastcgi':
enabled => $enabled,
descr => 'FastCGI basearch packages for Ceph',
name => 'ext-ceph-fastcgi',
baseurl => "http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel${el}-x86_64-basic/ref/master",
gpgcheck => '1',
gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
mirrorlist => absent,
priority => '20', # prefer ceph repos over EPEL
tag => 'ceph',
}
if $fastcgi {
yumrepo { 'ext-ceph-fastcgi':
enabled => $enabled,
descr => 'FastCGI basearch packages for Ceph',
name => 'ext-ceph-fastcgi',
baseurl => "http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel${el}-x86_64-basic/ref/master",
gpgcheck => '1',
gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
mirrorlist => absent,
priority => '20', # prefer ceph repos over EPEL
tag => 'ceph',
}
}
@ -206,7 +199,7 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
}
}
if $enable_epel and ($::operatingsystem != 'Fedora') {
if $enable_epel {
yumrepo { "ext-epel-${el}":
# puppet versions prior to 3.5 do not support ensure, use enabled instead
enabled => $enabled,

3
manifests/rgw/keystone.pp
View File

@ -84,8 +84,7 @@ define ceph::rgw::keystone (
}
# FIXME(ykarel) Cleanup once https://tracker.ceph.com/issues/24228 is fixed for luminous
if ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
if ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
ceph_config {
"client.${name}/rgw_ldap_secret": value => '';
}

6
metadata.json
View File

@ -20,12 +20,6 @@
"9"
]
},
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"24"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [

4
releasenotes/notes/drop-fedora-01b1484406c0c888.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Fedora is no longer supported.

146
spec/classes/ceph_repo_spec.rb
View File

@ -155,18 +155,18 @@ describe 'ceph::repo' do
before do
facts.merge!( :osfamily => 'RedHat',
:operatingsystem => 'RedHat',
:operatingsystemmajrelease => '7' )
:operatingsystemmajrelease => '8' )
end
context 'with default params' do
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -175,7 +175,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -186,7 +186,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -201,14 +201,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -217,7 +217,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://download.ceph.com/rpm-firefly/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-firefly/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -228,7 +228,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://download.ceph.com/rpm-firefly/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-firefly/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -243,7 +243,7 @@ describe 'ceph::repo' do
}
end
it { should_not contain_yumrepo('ext-epel-7') }
it { should_not contain_yumrepo('ext-epel-8') }
end
context 'when using a proxy for yum repositories' do
@ -255,14 +255,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
:proxy => 'http://someproxy.com:8080/',
@ -274,7 +274,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -288,7 +288,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -307,14 +307,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '0',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -323,7 +323,7 @@ describe 'ceph::repo' do
:enabled => '0',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -334,7 +334,7 @@ describe 'ceph::repo' do
:enabled => '0',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -345,7 +345,7 @@ describe 'ceph::repo' do
:enabled => '0',
:descr => 'FastCGI basearch packages for Ceph',
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel8-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
@ -360,14 +360,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -376,7 +376,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -387,7 +387,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -398,7 +398,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'FastCGI basearch packages for Ceph',
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel8-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
@ -411,18 +411,18 @@ describe 'ceph::repo' do
before do
facts.merge!( :osfamily => 'RedHat',
:operatingsystem => 'CentOS',
:operatingsystemmajrelease => '7' )
:operatingsystemmajrelease => '8' )
end
context 'with default params' do
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -431,7 +431,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -442,7 +442,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -457,14 +457,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -473,7 +473,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph firefly',
:name => 'ext-ceph-firefly',
:baseurl => 'http://download.ceph.com/rpm-firefly/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-firefly/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -484,7 +484,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-firefly-noarch',
:baseurl => 'http://download.ceph.com/rpm-firefly/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-firefly/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -499,13 +499,13 @@ describe 'ceph::repo' do
}
end
it { should_not contain_yumrepo('ext-epel-7') }
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/7/storage/x86_64/ceph-nautilus/',
:baseurl => 'http://mirror.centos.org/centos/8/storage/x86_64/ceph-nautilus/',
)}
end
@ -517,7 +517,7 @@ describe 'ceph::repo' do
}
end
it { should_not contain_yumrepo('ext-epel-7') }
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') }
@ -535,14 +535,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '0',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -551,7 +551,7 @@ describe 'ceph::repo' do
:enabled => '0',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -562,7 +562,7 @@ describe 'ceph::repo' do
:enabled => '0',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -573,7 +573,7 @@ describe 'ceph::repo' do
:enabled => '0',
:descr => 'FastCGI basearch packages for Ceph',
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel8-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',
@ -588,14 +588,14 @@ describe 'ceph::repo' do
}
end
it { should contain_yumrepo('ext-epel-7').with(
it { should contain_yumrepo('ext-epel-8').with(
:enabled => '1',
:descr => 'External EPEL 7',
:name => 'ext-epel-7',
:descr => 'External EPEL 8',
:name => 'ext-epel-8',
:baseurl => 'absent',
:gpgcheck => '1',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch',
:gpgkey => 'https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
:mirrorlist => 'http://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch',
:priority => '20',
:exclude => 'python-ceph-compat python-rbd python-rados python-cephfs',
)}
@ -604,7 +604,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph nautilus',
:name => 'ext-ceph-nautilus',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/$basearch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/$basearch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -615,7 +615,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'External Ceph noarch',
:name => 'ext-ceph-nautilus-noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el7/noarch',
:baseurl => 'http://download.ceph.com/rpm-nautilus/el8/noarch',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/release.asc',
:mirrorlist => 'absent',
@ -626,7 +626,7 @@ describe 'ceph::repo' do
:enabled => '1',
:descr => 'FastCGI basearch packages for Ceph',
:name => 'ext-ceph-fastcgi',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel7-x86_64-basic/ref/master',
:baseurl => 'http://gitbuilder.ceph.com/mod_fastcgi-rpm-rhel8-x86_64-basic/ref/master',
:gpgcheck => '1',
:gpgkey => 'https://download.ceph.com/keys/autobuild.asc',
:mirrorlist => 'absent',