From 67a7a61ea085ca9888beae2b08c0a45caa82e4a9 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 13 May 2015 17:08:35 -0400 Subject: [PATCH] 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 --- spec/acceptance/ceilometer_with_mysql_spec.rb | 5 +++-- spec/spec_helper_acceptance.rb | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/acceptance/ceilometer_with_mysql_spec.rb b/spec/acceptance/ceilometer_with_mysql_spec.rb index 6a98d1e..4d4e825 100644 --- 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 2d49992..e0c0e1a 100644 --- 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') -- 2.45.2