Skip to content

Commit

Permalink
Revert hard require on epel for CentOS 7
Browse files Browse the repository at this point in the history
This leaves some of the documentation about epel, and installs it for
acceptance tests, but leaves it up to users on CentOS to include this
separately if needed.

Fixes #995
  • Loading branch information
wyardley committed May 22, 2024
1 parent 137edee commit c6928ad
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ These are now documented via [Puppet Strings](https://github.com/puppetlabs/pupp

You can view example usage in [REFERENCE](REFERENCE.md).

**[puppet/epel](https://forge.puppet.com/modules/puppet/epel) is a soft dependency. The module requires it if you're on CentOS 7**
**[puppet/epel](https://forge.puppet.com/modules/puppet/epel) is a soft dependency. On CentOS, with `$repos_ensure` set to `false` (current default), it may be required.

Version v13.2.0 and older also added an erlang repository on CentOS 7. That isn't used and can be safely removed.

Expand Down
2 changes: 0 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,6 @@
default: {
}
}
} elsif ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') {
require epel
}

contain rabbitmq::install
Expand Down
7 changes: 6 additions & 1 deletion spec/acceptance/class_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
context 'default class inclusion' do
let(:pp) do
<<-EOS
include rabbitmq
# Hack to make sure tests work w/ soft EPEL dependency on CentOS / EL7
if ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') {
require epel
}
include rabbitmq
Class['epel'] -> Class['rabbitmq']
EOS
end

Expand Down

0 comments on commit c6928ad

Please sign in to comment.