Remove old EPEL compat code
This compat code is not required anymore since we dont support older versions anymore. Change-Id: Iafdaabd7542194998e9c685d42d0d11458812200
This commit is contained in:
parent
5d64035d5c
commit
b365e5866e
@ -137,22 +137,11 @@ class openstack_extras::repo::redhat::redhat(
|
||||
if ($::osfamily == 'RedHat' and
|
||||
$::operatingsystem != 'Fedora')
|
||||
{
|
||||
# 'metalink' property is supported from Puppet 3.5
|
||||
if (versioncmp($::puppetversion, '3.5') >= 0) {
|
||||
$epel_hash = { 'epel' => {
|
||||
'metalink' => "https://mirrors.fedoraproject.org/metalink?repo=epel-${::operatingsystemmajrelease}&arch=\$basearch",
|
||||
'descr' => "Extra Packages for Enterprise Linux ${::operatingsystemmajrelease} - \$basearch",
|
||||
'gpgkey' => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::operatingsystemmajrelease}",
|
||||
'failovermethod' => 'priority'
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$epel_hash = { 'epel' => {
|
||||
'baseurl' => "https://download.fedoraproject.org/pub/epel/${::operatingsystemmajrelease}/\$basearch",
|
||||
'descr' => "Extra Packages for Enterprise Linux ${::operatingsystemmajrelease} - \$basearch",
|
||||
'gpgkey' => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::operatingsystemmajrelease}",
|
||||
'failovermethod' => 'priority'
|
||||
}
|
||||
$epel_hash = { 'epel' => {
|
||||
'metalink' => "https://mirrors.fedoraproject.org/metalink?repo=epel-${::operatingsystemmajrelease}&arch=\$basearch",
|
||||
'descr' => "Extra Packages for Enterprise Linux ${::operatingsystemmajrelease} - \$basearch",
|
||||
'gpgkey' => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-${::operatingsystemmajrelease}",
|
||||
'failovermethod' => 'priority'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -179,32 +179,17 @@ describe 'openstack_extras::repo::redhat::redhat' do
|
||||
default_params.merge!({ :manage_epel => true })
|
||||
end
|
||||
|
||||
# 'metalink' property is supported from Puppet 3.5
|
||||
if Puppet.version.to_f >= 3.5
|
||||
it { should contain_yumrepo('epel').with(
|
||||
:metalink => "https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=\$basearch",
|
||||
:descr => 'Extra Packages for Enterprise Linux 7 - $basearch',
|
||||
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7',
|
||||
:failovermethod => 'priority',
|
||||
:enabled => '1',
|
||||
:gpgcheck => '1',
|
||||
:mirrorlist => 'absent',
|
||||
:require => 'Anchor[openstack_extras_redhat]',
|
||||
:notify => 'Exec[yum_refresh]'
|
||||
)}
|
||||
else
|
||||
it { should contain_yumrepo('epel').with(
|
||||
:baseurl => "https://download.fedoraproject.org/pub/epel/7/\$basearch",
|
||||
:descr => 'Extra Packages for Enterprise Linux 7 - $basearch',
|
||||
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7',
|
||||
:failovermethod => 'priority',
|
||||
:enabled => '1',
|
||||
:gpgcheck => '1',
|
||||
:mirrorlist => 'absent',
|
||||
:require => 'Anchor[openstack_extras_redhat]',
|
||||
:notify => 'Exec[yum_refresh]'
|
||||
)}
|
||||
end
|
||||
it { should contain_yumrepo('epel').with(
|
||||
:metalink => "https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=\$basearch",
|
||||
:descr => 'Extra Packages for Enterprise Linux 7 - $basearch',
|
||||
:gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7',
|
||||
:failovermethod => 'priority',
|
||||
:enabled => '1',
|
||||
:gpgcheck => '1',
|
||||
:mirrorlist => 'absent',
|
||||
:require => 'Anchor[openstack_extras_redhat]',
|
||||
:notify => 'Exec[yum_refresh]'
|
||||
)}
|
||||
end
|
||||
|
||||
context 'with epel management disabled' do
|
||||
|
Loading…
x
Reference in New Issue
Block a user