openstack
/
puppet-openstacklib
Code Issues Proposed changes

acceptance: install rabbitmq from Puppetforge and not from source 

* To be consistent with other modules, install RabbitMQ from Puppet
  forge tool and not from source.
* On CentOS7, use stable repository instead of testing.
* Include ::apt in the scope.

Change-Id: I608de604a43dc04acda51462c4ae54c4d26c1d01
This commit is contained in:
Emilien Macchi 2015-07-05 14:09:27 -04:00
parent 8458b46954
commit 5b7525d3e1
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spec/acceptance/rabbitmq_spec.rb
View File

@ -11,19 +11,11 @@ describe 'openstacklib class' do
if $::osfamily == 'RedHat' {
# RabbitMQ is not available in default repo
class { '::openstack_extras::repo::redhat::redhat':
# Kilo is not GA yet, so let's use the testing repo
manage_rdo => false,
repo_hash => {
'rdo-kilo-testing' => {
'baseurl' => 'https://repos.fedorapeople.org/repos/openstack/openstack-kilo/testing/el7/',
# packages are not GA so not signed
'gpgcheck' => '0',
'priority' => 97,
},
},
release => 'kilo',
}
$package_provider = 'yum'
} else {
include ::apt
$package_provider = 'apt'
}

3
spec/spec_helper_acceptance.rb
View File

@ -27,11 +27,10 @@ RSpec.configure do |c|
# install library modules from the forge
on host, puppet('module','install','puppetlabs-mysql'), { :acceptable_exit_codes => 0 }
on host, puppet('module','install','puppetlabs-rabbitmq'), { :acceptable_exit_codes => 0 }
on host, puppet('module','install','puppetlabs-apache'), { :acceptable_exit_codes => 0 }
on host, puppet('module','install','puppetlabs-postgresql'), { :acceptable_exit_codes => 0 }
on host, puppet('module','install','stahnma-epel'), { :acceptable_exit_codes => 0 }
# until https://github.com/tamaskozak/puppetlabs-rabbitmq/commit/8bbfe320035fae2ae900211501008d63dc3c171c is part of a release
shell('git clone https://github.com/puppetlabs/puppetlabs-rabbitmq /etc/puppet/modules/rabbitmq')
shell('git clone https://git.openstack.org/openstack/puppet-openstack_extras /etc/puppet/modules/openstack_extras')
# Install the module being tested
puppet_module_install(:source => proj_root, :module_name => 'openstacklib')