Switch from garethr/erlang->puppet/erlang

voxpupuli · Oct 31, 2023 · e12b71c · e12b71c
1 parent c442d00
commit e12b71c
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 23 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -3,7 +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'
     yumrepo_core:
       repo: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core'

diff --git a/examples/erlang_deps.pp b/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']
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -17,7 +17,7 @@
       <<-EOS
       class { 'rabbitmq': }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -55,7 +55,7 @@ class { 'rabbitmq':
           service_ensure => 'stopped',
         }
         if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
+          class { 'erlang': }
           Class['erlang'] -> Class['rabbitmq']
         }
       EOS
@@ -74,7 +74,7 @@ class { 'erlang': epel_enable => true}
       pp_pre = <<-EOS
         class { 'rabbitmq': }
         if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
+          class { 'erlang': }
           Class['erlang'] -> Class['rabbitmq']
         }
       EOS
@@ -85,7 +85,7 @@ class { 'rabbitmq':
           service_ensure  => 'stopped',
         }
         if $facts['os']['family'] == 'RedHat' {
-          class { 'erlang': epel_enable => true}
+          class { 'erlang': }
           Class['erlang'] -> Class['rabbitmq']
         }
       EOS

diff --git a/spec/acceptance/clustering_spec.rb b/spec/acceptance/clustering_spec.rb
@@ -15,7 +15,7 @@ class { 'rabbitmq':
         wipe_db_on_cookie_change => false,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -40,7 +40,7 @@ class { 'rabbitmq':
         wipe_db_on_cookie_change => true,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS
@@ -85,7 +85,7 @@ class { 'rabbitmq':
         erlang_cookie            => 'TESTCOOKIE',
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS

diff --git a/spec/acceptance/delete_guest_user_spec.rb b/spec/acceptance/delete_guest_user_spec.rb
@@ -11,7 +11,7 @@ class { 'rabbitmq':
         delete_guest_user => true,
       }
       if $facts['os']['family'] == 'RedHat' {
-        class { 'erlang': epel_enable => true}
+        class { 'erlang': }
         Class['erlang'] -> Class['rabbitmq']
       }
       EOS

diff --git a/spec/acceptance/parameter_spec.rb b/spec/acceptance/parameter_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':

diff --git a/spec/acceptance/policy_spec.rb b/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':

diff --git a/spec/acceptance/queue_spec.rb b/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':

diff --git a/spec/acceptance/rabbitmqadmin_spec.rb b/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

diff --git a/spec/acceptance/user_spec.rb b/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':

diff --git a/spec/acceptance/vhost_spec.rb b/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':

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -7,7 +7,7 @@
   when 'Debian'
     install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
   when 'RedHat'
-    install_module_from_forge_on(host, 'garethr-erlang', '>= 0.3.0 < 1.0.0')
+    install_module_from_forge_on(host, 'puppet-erlang', '>= 1.1.0 < 2.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')