Additional fixes for new version

data/common.yaml

@@ -31,7 +31,6 @@ rabbitmq::repo_gpg_key: ~
 rabbitmq::package_name: 'rabbitmq'
 rabbitmq::package_source: ~
 rabbitmq::package_provider: ~
-rabbitmq::repos_ensure: false
 rabbitmq::manage_python: true
 rabbitmq::python_package: 'python'
 rabbitmq::rabbitmq_user: 'rabbitmq'

examples/full.pp

@@ -1,6 +1,5 @@
 class { 'rabbitmq':
   delete_guest_user => true,
-  repos_ensure      => true,
   package_apt_pin   => 900,
 }
 

spec/acceptance/class_spec.rb

@@ -15,7 +15,7 @@
   context 'default class inclusion' do
     let(:pp) do
       <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang': } ->
       class { 'rabbitmq': }
       EOS
     end

spec/acceptance/clustering_spec.rb

@@ -6,7 +6,7 @@
   context 'rabbitmq::wipe_db_on_cookie_change => false' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
         config_cluster           => true,
@@ -28,7 +28,7 @@ class { 'rabbitmq':
   context 'rabbitmq::wipe_db_on_cookie_change => true' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
         config_cluster           => true,
@@ -70,7 +70,7 @@ class { 'rabbitmq':
   context 'rabbitmq::cluster[:local_node] = foobar' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         cluster                  => { 'name' => 'rabbit_cluster', 'init_node' => 'foobar', 'local_node' => 'foobar' },
         config_cluster           => true,

spec/acceptance/delete_guest_user_spec.rb

@@ -6,7 +6,7 @@
   context 'delete_guest_user' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         port              => 5672,
         delete_guest_user => true,

spec/acceptance/parameter_spec.rb

@@ -6,7 +6,7 @@
   context 'create parameter resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

spec/acceptance/policy_spec.rb

@@ -6,7 +6,7 @@
   context 'create policy resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

spec/acceptance/queue_spec.rb

@@ -6,7 +6,7 @@
   context 'create binding and queue resources when using default management port' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
@@ -77,7 +77,7 @@ class { 'rabbitmq':
   context 'create multiple bindings when same source / destination / vhost but different routing keys' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,
@@ -162,7 +162,7 @@ class { 'rabbitmq':
   context 'create binding and queue resources when using a non-default management port' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

spec/acceptance/rabbitmqadmin_spec.rb

@@ -6,7 +6,7 @@
   context 'downloads the cli tools' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         admin_enable   => true,
         service_manage => true,
@@ -24,7 +24,7 @@ class { 'rabbitmq':
   context 'does nothing if service is unmanaged' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         admin_enable   => true,
         service_manage => false,
@@ -44,7 +44,7 @@ class { 'rabbitmq':
     it 'runs successfully' do
       # make sure credential change takes effect before admin_enable
       pp_pre = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage => true,
         default_user   => 'foobar',
@@ -53,7 +53,7 @@ class { 'rabbitmq':
       EOS
 
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         admin_enable   => true,
         service_manage => true,

spec/acceptance/user_spec.rb

@@ -6,7 +6,7 @@
   context 'create user resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

spec/acceptance/vhost_spec.rb

@@ -6,7 +6,7 @@
   context 'create vhost resource' do
     it 'runs successfully' do
       pp = <<-EOS
-      class { 'erlang': repo_source => 'packagecloud' } ->
+      class { 'erlang':  } ->
       class { 'rabbitmq':
         service_manage    => true,
         port              => 5672,

spec/spec_helper_acceptance.rb

@@ -3,11 +3,9 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_module_from_forge_on(host, 'puppet-erlang', '>= 1.0.0 < 2.0.0')
+  install_module_from_forge_on(host, 'puppet-erlang', '>= 1.1.0 < 2.0.0')
 
   case fact_on(host, 'os.family')
-  when 'Debian'
-    install_module_from_forge_on(host, 'puppetlabs-apt', '>= 4.1.0 < 9.0.0')
   when 'RedHat'
     if fact_on(host, 'os.selinux.enabled')
       # Make sure selinux is disabled so the tests work.