From ce46e4782d1225a6ba7065a7836367fea729a570 Mon Sep 17 00:00:00 2001 From: Simon Aquino Date: Mon, 10 Nov 2014 22:08:49 +0000 Subject: [PATCH 1/2] puppetlabs/apt should be installed before rabbitmq Puppetlabs/rabbitmq installs the latest puppetlabs/apt (v 1.7.0). When attempting to subsequently install puppetlabs/apt (v 1.6.0), the operation fails. This commits reverts the order of these two events: puppetlabs/apt v1.6.0 is now installed first and this satsfies the puppetlabs/rabbitmq dependency. --- spec/spec_helper_acceptance.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 0055801..88e567a 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -37,9 +37,9 @@ shell('/bin/touch /etc/puppet/hiera.yaml') shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0] }) shell('puppet module install maestrodev/wget --version 1.4.5', { :acceptable_exit_codes => [0] }) + shell('puppet module install puppetlabs/apt --version 1.6.0', { :acceptable_exit_codes => [0] }) shell('puppet module install puppetlabs-rabbitmq --version 4.1.0', { :acceptable_exit_codes => [0] }) shell('puppet module install fsalum-redis --version 1.0.0', { :acceptable_exit_codes => [0] }) - shell('puppet module install puppetlabs/apt --version 1.6.0', { :acceptable_exit_codes => [0] }) shell('puppet module install sensu-sensu', { :acceptable_exit_codes => [0] }) shell('puppet module install richardc/datacat', { :acceptable_exit_codes => [0] }) end From 359df6772f94326a765ae1f04c29a31ad2a35aa1 Mon Sep 17 00:00:00 2001 From: Simon Aquino Date: Mon, 10 Nov 2014 22:25:34 +0000 Subject: [PATCH 2/2] Install rabbitmq 3.3.5 for the beaker tests The puppetlabs/rabbitmq (v 3.4.0 puppet module is incompatible with rabbitmq 4.1. There is a PR open to make the puppetlabs module support the latest version of rabbitmq: https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/250 Until a new puppetlabs/rabbitmq release comes out, we should install rabbitmq 3.3.5 when we run the beaker tests. --- spec/acceptance/class_spec.rb | 1 + spec/spec_helper_acceptance.rb | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index bd56880..8b26c6d 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -7,6 +7,7 @@ it 'should work with no errors' do pp = <<-EOS class { 'rabbitmq': + package_ensure => installed, ssl => false, delete_guest_user => true, } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 88e567a..fae9eb4 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -29,10 +29,21 @@ # RubyGems missing on some Vagrant boxes # Otherwise you'lll get a load of 'Provider gem is not functional on this host' shell('apt-get install rubygems -y') + # TODO: puppetlabs-rabbitmq 4.1 doesn't support rabbitmq 3.4.0. + # Remove the following two lines after a new puppetlabs-rabbitmq release + # that contains PR #250 + shell('apt-get install erlang-nox -y') + shell('wget http://www.rabbitmq.com/releases/rabbitmq-server/v3.3.5/rabbitmq-server_3.3.5-1_all.deb && sudo dpkg -i rabbitmq-server_3.3.5-1_all.deb') end if fact('osfamily') == 'RedHat' # RedHat needs EPEL for RabbitMQ and Redis shell('wget http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm && sudo rpm -Uvh epel-release-6*.rpm') + # TODO: puppetlabs-rabbitmq 4.1 doesn't support rabbitmq 3.4.0. + # Remove the following three lines after a new puppetlabs-rabbitmq release + # that contains PR #250 + shell('sed -i \'s/\(mirrorlist=http\)s/\1/\' /etc/yum.repos.d/epel.repo') + shell('yum install -y erlang') + shell('rpm -Uvh http://www.rabbitmq.com/releases/rabbitmq-server/v3.3.5/rabbitmq-server-3.3.5-1.noarch.rpm') end shell('/bin/touch /etc/puppet/hiera.yaml') shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0] })