From 735c6641f02da78033eb6aa5e0458b61046ec73b Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Tue, 19 Sep 2017 11:02:10 -0400 Subject: [PATCH] Fix beaker tests to use openstack_integration for RabbitMQ The RabbitMQ acceptance tests used to be pointing towards the Kilo repos. This patch addresses it so that it leverages the Puppet OpenStack integration manifests instead. Change-Id: I3a647184141f5d66f212ee91d4cf36e8547c7517 --- spec/acceptance/rabbitmq_spec.rb | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/spec/acceptance/rabbitmq_spec.rb b/spec/acceptance/rabbitmq_spec.rb index 50755e6e..8bde503b 100644 --- a/spec/acceptance/rabbitmq_spec.rb +++ b/spec/acceptance/rabbitmq_spec.rb @@ -6,21 +6,9 @@ describe 'openstacklib class' do it 'should work with no errors' do pp= <<-EOS - Exec { logoutput => 'on_failure' } - - if $::osfamily == 'RedHat' { - class { '::openstack_extras::repo::redhat::redhat': - release => 'kilo', - manage_epel => false, - } - } else { - include ::apt - } - - class { '::rabbitmq': - delete_guest_user => true, - package_provider => $::package_provider - } + include ::openstack_integration + include ::openstack_integration::repos + include ::openstack_integration::rabbitmq # openstacklib resources include ::openstacklib::openstackclient