Switch from garethr/erlang->puppet/erlang

.fixtures.yml

@@ -3,6 +3,7 @@ fixtures:
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib'
     apt: 'https://github.com/puppetlabs/puppetlabs-apt'
     archive: 'https://github.com/voxpupuli/puppet-archive'
-    erlang: 'https://github.com/garethr/garethr-erlang'
+    erlang: 'https://github.com/voxpupuli/puppet-erlang'
     systemd: 'https://github.com/voxpupuli/puppet-systemd'
+    epel: 'https://github.com/voxpupuli/puppet-epel'
     yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core'

examples/erlang_deps.pp

@@ -1,5 +1,4 @@
-# install first the garethr-erlang module. See README.md
+# install first the puppet/erlang module. See README.md
 include erlang
 
-class { 'erlang': epel_enable => true }
 Class['erlang'] -> Class['rabbitmq']

manifests/init.pp

@@ -492,6 +492,8 @@
     }
   }
 
+  # when repos_ensure is true, we configure externel repos
+  # CentOS 7 doesn't contain rabbitmq. It's only in EPEL.
   if $repos_ensure {
     case $facts['os']['family'] {
       'RedHat': {
@@ -505,6 +507,8 @@
       default: {
       }
     }
+  } elsif ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') {
+    require epel
   }
 
   contain rabbitmq::install

spec/acceptance/class_spec.rb

@@ -15,11 +15,7 @@
   context 'default class inclusion' do
     let(:pp) do
       <<-EOS
-      class { 'rabbitmq': }
-      if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
-        Class['erlang'] -> Class['rabbitmq']
-      }
+      include rabbitmq
       EOS
     end
 
@@ -54,10 +50,6 @@
         class { 'rabbitmq':
           service_ensure => 'stopped',
         }
-        if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
-          Class['erlang'] -> Class['rabbitmq']
-        }
       EOS
     end
 
@@ -73,21 +65,13 @@
     it 'runs successfully' do
       pp_pre = <<-EOS
         class { 'rabbitmq': }
-        if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
-          Class['erlang'] -> Class['rabbitmq']
-        }
       EOS
 
       pp = <<-EOS
         class { 'rabbitmq':
           service_manage => false,
           service_ensure  => 'stopped',
         }
-        if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
-          Class['erlang'] -> Class['rabbitmq']
-        }
       EOS
 
       apply_manifest(pp_pre, catch_failures: true)
@@ -127,7 +111,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
@@ -162,7 +146,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
@@ -227,7 +211,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

spec/acceptance/clustering_spec.rb

@@ -15,7 +15,7 @@
         wipe_db_on_cookie_change => false,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -29,7 +29,7 @@
   end
 
   context 'rabbitmq::wipe_db_on_cookie_change => true' do
     it 'runs successfully' do
       pp = <<-EOS
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
@@ -40,7 +40,7 @@
         wipe_db_on_cookie_change => true,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -50,20 +50,20 @@
 
     describe file('/etc/rabbitmq/rabbitmq.config') do
       it { is_expected.to be_file }
       it { is_expected.to contain 'cluster_nodes' }
       it { is_expected.to contain 'rabbit@rabbit1' }
       it { is_expected.to contain 'rabbit@rabbit2' }
       it { is_expected.to contain 'ram' }
     end
 
     describe file('/var/lib/rabbitmq/.erlang.cookie') do
       it { is_expected.to be_file }
       it { is_expected.to contain 'TESTCOOKIE' }
     end
 
     describe 'rabbitmq_cluster' do
       context 'cluster_name => rabbit_cluster' do
         it 'cluster has name' do
           shell('rabbitmqctl -q cluster_status') do |r|
             expect(r.stdout).to match(%r!({cluster_name,<<"rabbit_cluster">>}|^Cluster name: rabbit_cluster$)!)
             expect(r.exit_code).to be_zero
@@ -85,7 +85,7 @@
         erlang_cookie            => 'TESTCOOKIE',
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS

spec/acceptance/delete_guest_user_spec.rb

@@ -4,14 +4,14 @@
 
 describe 'rabbitmq with delete_guest_user' do
   context 'delete_guest_user' do
     it 'runs successfully' do
       pp = <<-EOS
       class { 'rabbitmq':
         port              => 5672,
         delete_guest_user => true,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -21,7 +21,7 @@
     end
 
     describe file('/tmp/rabbitmqctl_users') do
       it { is_expected.to be_file }
       it { is_expected.not_to contain 'guest' }
     end
   end

spec/acceptance/parameter_spec.rb

@@ -4,10 +4,10 @@
 
 describe 'rabbitmq parameter on a vhost:' do
   context 'create parameter resource' do
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':

spec/acceptance/policy_spec.rb

@@ -7,7 +7,7 @@
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':

spec/acceptance/queue_spec.rb

@@ -7,7 +7,7 @@
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':
@@ -81,7 +81,7 @@ class { 'rabbitmq':
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':
@@ -169,7 +169,7 @@ class { 'rabbitmq':
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':

spec/acceptance/rabbitmqadmin_spec.rb

@@ -11,7 +11,7 @@ class { 'rabbitmq':
         service_manage => true,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -32,7 +32,7 @@ class { 'rabbitmq':
         service_manage => false,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -56,7 +56,7 @@ class { 'rabbitmq':
         default_pass   => 'bazblam',
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -69,7 +69,7 @@ class { 'rabbitmq':
         default_pass   => 'bazblam',
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS

spec/acceptance/user_spec.rb

@@ -7,7 +7,7 @@
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':

spec/acceptance/vhost_spec.rb

@@ -7,7 +7,7 @@
     it 'runs successfully' do
       pp = <<-EOS
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true }
+        class { 'erlang':  }
         Class['erlang'] -> Class['rabbitmq']
       }
       class { 'rabbitmq':

spec/spec_helper_acceptance.rb

@@ -7,7 +7,8 @@
   when 'Debian'
     install_puppet_module_via_pmt_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
   when 'RedHat'
-    install_puppet_module_via_pmt_on(host, 'garethr-erlang', '>= 0.3.0 < 1.0.0')
+    install_puppet_module_via_pmt_on(host, 'puppet-erlang', '>= 1.1.0 < 2.0.0')
+    install_puppet_module_via_pmt_on(host, 'puppet-epel', '>= 5.0.0 < 6.0.0')
     if fact_on(host, 'os.selinux.enabled')
       # Make sure selinux is disabled so the tests work.
       on host, puppet('resource', 'exec', 'setenforce 0', 'path=/bin:/sbin:/usr/bin:/usr/sbin', 'onlyif=which setenforce && getenforce | grep Enforcing')