Skip to content

Commit a190e52

Browse files
committed
Revert hard require on epel for CentOS 7
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
1 parent 137edee commit a190e52

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ These are now documented via [Puppet Strings](https://github.com/puppetlabs/pupp
4949

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

52-
**[puppet/epel](https://forge.puppet.com/modules/puppet/epel) is a soft dependency. The module requires it if you're on CentOS 7**
52+
**[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.
5353

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

manifests/init.pp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,6 @@
507507
default: {
508508
}
509509
}
510-
} elsif ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') {
511-
require epel
512510
}
513511

514512
contain rabbitmq::install

spec/acceptance/class_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
context 'default class inclusion' do
1616
let(:pp) do
1717
<<-EOS
18-
include rabbitmq
18+
# Hack to make sure tests work w/ soft EPEL dependency on CentOS / EL7
19+
if ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') {
20+
include epel
21+
}
22+
include rabbitmq
1923
EOS
2024
end
2125

0 commit comments

Comments
 (0)