From 98e60cfde9c3b264f9ca1d56a8e8c2bf8d45853f Mon Sep 17 00:00:00 2001 From: William Yardley Date: Mon, 20 May 2024 16:09:59 -0700 Subject: [PATCH] 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 --- README.md | 2 +- manifests/init.pp | 2 -- spec/acceptance/class_spec.rb | 9 ++++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b328d7925..8b9de8eac 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/manifests/init.pp b/manifests/init.pp index 942cbe1c2..c75096a83 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -507,8 +507,6 @@ default: { } } - } elsif ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') { - require epel } contain rabbitmq::install diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 9198c1889..585b6d2da 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -15,7 +15,14 @@ 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') { + include epel + include rabbitmq + Class['epel'] -> Class['rabbitmq'] + } else { + include rabbitmq + } EOS end