Remove Firefly base repo hacking

With firefly there was a need to exclude base packages
that conflicted, firefly is EOL and all release after
does not have that issue so we can remove this.

Change-Id: I7f107ff63232f1553d34ea5534431496e7460f4f
This commit is contained in:
Tobias Urdin 2019-02-07 19:59:16 +01:00
parent e0069da972
commit e39f7d2320
3 changed files with 4 additions and 38 deletions

View File

@ -150,19 +150,6 @@ not on ${::operatingsystem}, which can lead to packaging issues.")
$el = '7'
}
# Firefly is the last ceph.com supported release which conflicts with
# the CentOS 7 base channel. Therefore make sure to only exclude the
# conflicting packages in the exact combination of CentOS7 and Firefly.
# TODO: Remove this once Firefly becomes EOL
if ($::operatingsystem == 'CentOS' and $el == '7' and $release == 'firefly') {
file_line { 'exclude base':
ensure => $ensure,
path => '/etc/yum.repos.d/CentOS-Base.repo',
after => '^\[base\]$',
line => 'exclude=python-ceph-compat python-rbd python-rados python-cephfs',
} -> Package<| tag == 'ceph' |>
}
Yumrepo {
proxy => $proxy,
proxy_username => $proxy_username,

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Ceph Firefly is EOL since a long time and is no longer supported.

View File

@ -159,8 +159,6 @@ describe 'ceph::repo' do
end
context 'with default params' do
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
@ -203,8 +201,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
@ -259,8 +255,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
@ -313,8 +307,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '0',
:descr => 'External EPEL 7',
@ -368,8 +360,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
@ -425,8 +415,6 @@ describe 'ceph::repo' do
end
context 'with default params' do
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
@ -469,13 +457,6 @@ describe 'ceph::repo' do
}
end
it { should contain_file_line('exclude base').with(
:ensure => 'present',
:path => '/etc/yum.repos.d/CentOS-Base.repo',
:after => '^\[base\]$',
:line => 'exclude=python-ceph-compat python-rbd python-rados python-cephfs',
)}
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',
@ -518,7 +499,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should_not contain_yumrepo('ext-epel-7') }
it { should_not contain_yumrepo('ext-ceph') }
it { should_not contain_yumrepo('ext-ceph-noarch') }
@ -537,7 +517,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should_not contain_yumrepo('ext-epel-7') }
it { should_not contain_yumrepo('ext-ceph') }
it { should_not contain_yumrepo('ext-ceph-noarch') }
@ -556,8 +535,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '0',
:descr => 'External EPEL 7',
@ -611,8 +588,6 @@ describe 'ceph::repo' do
}
end
it { should_not contain_file_line('exclude base') }
it { should contain_yumrepo('ext-epel-7').with(
:enabled => '1',
:descr => 'External EPEL 7',