Skip to content

Commit

Permalink
package: removed a warning for Fedora 18 and below
Browse files Browse the repository at this point in the history
Those versions no longer supported by the Fedora Project.
  • Loading branch information
Matthew Haughton committed Dec 11, 2014
1 parent 5b09b23 commit 029f73f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
10 changes: 0 additions & 10 deletions manifests/package/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@
}

case $::operatingsystem {
'fedora': {
# nginx.org does not supply RPMs for fedora
# fedora 18 provides 1.2.x packages
# fedora 19 has 1.4.x packages are in

# fedora 18 users will need to supply their own nginx 1.4 rpms and/or repo
if $::lsbmajdistrelease and $::lsbmajdistrelease < 19 {
notice("${::operatingsystem} ${::lsbmajdistrelease} does not supply nginx >= 1.4 packages")
}
}
default: {
case $major_dist_release {
5, 6, 7: {
Expand Down
9 changes: 0 additions & 9 deletions spec/classes/package_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,6 @@
it_behaves_like 'debian', 'Ubuntu', 'precise', 'Ubuntu', '12.04'
end

context 'fedora' do
# fedora is identical to the rest of osfamily RedHat except for not
# including nginx-release
let(:facts) {{ :operatingsystem => 'Fedora', :osfamily => 'RedHat', :lsbmajdistrelease => 6 }}
it { is_expected.to contain_package('nginx') }
it { is_expected.not_to contain_yumrepo('nginx-release') }
it { is_expected.not_to contain_file('/etc/yum.repos.d/nginx-release.repo') }
end

context 'other' do
let(:facts) {{ :operatingsystem => 'xxx', :osfamily => 'linux' }}
it { is_expected.to contain_package('nginx') }
Expand Down

0 comments on commit 029f73f

Please sign in to comment.