Revert hard require on epel for CentOS 7

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.
 

manifests/init.pp

@@ -507,8 +507,6 @@
       default: {
       }
     }
-  } elsif ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') {
-    require epel
   }
 
   contain rabbitmq::install

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
 
@@ -111,7 +118,7 @@
     end
 
     describe port(25_672) do
       xit 'Is on 55672 instead on older rmq versions' do
         is_expected.to be_listening.on('0.0.0.0').with('tcp')
       end
     end
@@ -146,7 +153,7 @@
     # This listens on all interfaces regardless of these settings
 
     describe port(25_672) do
       xit 'Is on 55672 instead on older rmq versions' do
         is_expected.to be_listening.on('0.0.0.0').with('tcp')
       end
     end
@@ -211,7 +218,7 @@
     end
 
     describe port(25_672) do
       xit 'Is on 55672 instead on older rmq versions' do
         is_expected.to be_listening.on('0.0.0.0').with('tcp')
       end
     end