acceptance: don't install erlang on RHEL

Puppet erlang module does not pin puppetlabs-apt so it will have
conflicts in other modules if we want to use it (since we try to not use
2.0.0 release).

Let's simplify acceptance tests in not using erlang module and be
consistent with all Puppet OpenStack modules tests.

Change-Id: I6c79968becc11a19bddd2cba5aedb663f4c80c61

diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb
index 6a98d1ea5d3fab16fcf3d643001c113108c4639c..4d4e8259b9521ddcfbd08a04cdf51a72c5faddcd 100644 (file)
--- a/spec/acceptance/ceilometer_with_mysql_spec.rb
+++ b/spec/acceptance/ceilometer_with_mysql_spec.rb
@@ -16,6 +16,7 @@ describe 'ceilometer with mysql' do
             release         => 'kilo',
             package_require => true,
           }
+          $package_provider = 'apt'
         }
         'RedHat': {
           class { '::openstack_extras::repo::redhat::redhat':
@@ -30,8 +31,7 @@ describe 'ceilometer with mysql' do
               },
             },
           }
-          include ::erlang
-          Class['erlang'] -> Class['rabbitmq']
+          $package_provider = 'yum'
         }
         default: {
           fail("Unsupported osfamily (${::osfamily})")
@@ -43,6 +43,7 @@ describe 'ceilometer with mysql' do
       class { '::rabbitmq':
         delete_guest_user => true,
         erlang_cookie     => 'secrete',
+        package_provider  => $package_provider,
       }
 
       rabbitmq_vhost { '/':

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 2d49992e3a11bb313f738090114cba26aaaeb406..e0c0e1afb93b26b43c5e3688b4128e4f279bb7a8 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -31,7 +31,6 @@ RSpec.configure do |c|
       on host, puppet('module','install','puppetlabs-mysql'), { :acceptable_exit_codes => 0 }
       on host, puppet('module','install','dprince/qpid'), { :acceptable_exit_codes => 0 }
       on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => 0 }
-      on host, puppet('module','install','garethr-erlang'), { :acceptable_exit_codes => 0 }
 
       # install puppet modules from git, use master
       shell('git clone https://git.openstack.org/stackforge/puppet-openstacklib /etc/puppet/modules/openstacklib')