Switch from garethr/erlang->puppet/erlang

bastelfreak · bastelfreak · commit 453f61fa99a5 · 2024-05-18T23:52:26.000+02:00
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -3,6 +3,6 @@ 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: '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')

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`<<-EOS`
`18`	`18`	`class { 'rabbitmq': }`
`19`	`19`	`if $facts['os']['family'] == 'RedHat' {`
`20`		`- class { 'erlang': epel_enable => true}`
	`20`	`+ class { 'erlang': }`
`21`	`21`	`Class['erlang'] -> Class['rabbitmq']`
`22`	`22`	`}`
`23`	`23`	`EOS`
`@@ -55,7 +55,7 @@ class { 'rabbitmq':`
`55`	`55`	`service_ensure => 'stopped',`
`56`	`56`	`}`
`57`	`57`	`if $facts['os']['family'] == 'RedHat' {`
`58`		`- class { 'erlang': epel_enable => true}`
	`58`	`+ class { 'erlang': }`
`59`	`59`	`Class['erlang'] -> Class['rabbitmq']`
`60`	`60`	`}`
`61`	`61`	`EOS`
`@@ -74,7 +74,7 @@ class { 'erlang': epel_enable => true}`
`74`	`74`	`pp_pre = <<-EOS`
`75`	`75`	`class { 'rabbitmq': }`
`76`	`76`	`if $facts['os']['family'] == 'RedHat' {`
`77`		`- class { 'erlang': epel_enable => true}`
	`77`	`+ class { 'erlang': }`
`78`	`78`	`Class['erlang'] -> Class['rabbitmq']`
`79`	`79`	`}`
`80`	`80`	`EOS`
`@@ -85,7 +85,7 @@ class { 'rabbitmq':`
`85`	`85`	`service_ensure => 'stopped',`
`86`	`86`	`}`
`87`	`87`	`if $facts['os']['family'] == 'RedHat' {`
`88`		`- class { 'erlang': epel_enable => true}`
	`88`	`+ class { 'erlang': }`
`89`	`89`	`Class['erlang'] -> Class['rabbitmq']`
`90`	`90`	`}`
`91`	`91`	`EOS`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class { 'rabbitmq':`
`15`	`15`	`wipe_db_on_cookie_change => false,`
`16`	`16`	`}`
`17`	`17`	`if $facts['os']['family'] == 'RedHat' {`
`18`		`- class { 'erlang': epel_enable => true}`
	`18`	`+ class { 'erlang': }`
`19`	`19`	`Class['erlang'] -> Class['rabbitmq']`
`20`	`20`	`}`
`21`	`21`	`EOS`
`@@ -40,7 +40,7 @@ class { 'rabbitmq':`
`40`	`40`	`wipe_db_on_cookie_change => true,`
`41`	`41`	`}`
`42`	`42`	`if $facts['os']['family'] == 'RedHat' {`
`43`		`- class { 'erlang': epel_enable => true}`
	`43`	`+ class { 'erlang': }`
`44`	`44`	`Class['erlang'] -> Class['rabbitmq']`
`45`	`45`	`}`
`46`	`46`	`EOS`
`@@ -85,7 +85,7 @@ class { 'rabbitmq':`
`85`	`85`	`erlang_cookie => 'TESTCOOKIE',`
`86`	`86`	`}`
`87`	`87`	`if $facts['os']['family'] == 'RedHat' {`
`88`		`- class { 'erlang': epel_enable => true}`
	`88`	`+ class { 'erlang': }`
`89`	`89`	`Class['erlang'] -> Class['rabbitmq']`
`90`	`90`	`}`
`91`	`91`	`EOS`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class { 'rabbitmq':`
`11`	`11`	`delete_guest_user => true,`
`12`	`12`	`}`
`13`	`13`	`if $facts['os']['family'] == 'RedHat' {`
`14`		`- class { 'erlang': epel_enable => true}`
	`14`	`+ class { 'erlang': }`
`15`	`15`	`Class['erlang'] -> Class['rabbitmq']`
`16`	`16`	`}`
`17`	`17`	`EOS`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`it 'runs successfully' do`
`8`	`8`	`pp = <<-EOS`
`9`	`9`	`if $facts['os']['family'] == 'RedHat' {`
`10`		`- class { 'erlang': epel_enable => true }`
	`10`	`+ class { 'erlang': }`
`11`	`11`	`Class['erlang'] -> Class['rabbitmq']`
`12`	`12`	`}`
`13`	`13`	`class { 'rabbitmq':`