From c37d05692c62a71bd52d82a692cb43086aa0abfd Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Mon, 19 Aug 2019 12:29:11 +0200 Subject: [PATCH] Make puppet-tripleo compatible with latest puppet-rabbitmq https://review.opendev.org/#/c/677082/ merged today and moved puppet-rabbitmq to 9.1.0 which is breaking our spec tests: https://zuul.opendev.org/t/openstack/build/e767db93fe214514bebc065a64288548/log/job-output.txt So we error out with things like: 2019-08-19 07:19:37.527187 | centos-7 | 1) tripleo::certmonger::rabbitmq on redhat-7-x86_64 behaves like tripleo::certmonger::rabbitmq should include the base for using certmonger 2019-08-19 07:19:37.527435 | centos-7 | Failure/Error: include ::rabbitmq::params 2019-08-19 07:19:37.527713 | centos-7 | Puppet::PreformattedError: 2019-08-19 07:19:37.528769 | centos-7 | Evaluation Error: Error while evaluating a Function Call, Could not find class ::rabbitmq::params for centos-7-rax-ord-0010255916 (file: /home/zuul/workspace/spec/fixtures/modules/tripleo/manifests/certmonger/rabbitmq.pp, line: 51, column: 3) on node centos-7-rax-ord-0010255916 Let's remove any reference to rabbitmq::params and also the following two notifies: File[$service_certificate] ~> Service<| title == $::rabbitmq::service_name |> File[$service_key] ~> Service<| title == $::rabbitmq::service_name |> They do nothing in a containerized deployment anyway. Tested as follows: - Full downstream OSP15 HA deploy Change-Id: Ib7c373c10ff7bcd8ec33cb912a8a0a4a32a196e2 Closes-Bug: #1840641 (cherry picked from commit 1e65c3f4fcc7b49c39a26fbe69a58a9677bdd2d0) --- manifests/certmonger/rabbitmq.pp | 4 ---- spec/classes/tripleo_certmonger_rabbitmq_spec.rb | 4 ---- 2 files changed, 8 deletions(-) diff --git a/manifests/certmonger/rabbitmq.pp b/manifests/certmonger/rabbitmq.pp index b3fcf25f8..dc472f790 100644 --- a/manifests/certmonger/rabbitmq.pp +++ b/manifests/certmonger/rabbitmq.pp @@ -48,7 +48,6 @@ class tripleo::certmonger::rabbitmq ( $principal = undef, ) { include ::certmonger - include ::rabbitmq::params ensure_resource('file', '/usr/bin/certmonger-rabbitmq-refresh.sh', { source => 'puppet:///modules/tripleo/certmonger-rabbitmq-refresh.sh', @@ -80,7 +79,4 @@ class tripleo::certmonger::rabbitmq ( group => $::rabbitmq::params::rabbitmq_group, require => Certmonger_certificate['rabbitmq'], } - - File[$service_certificate] ~> Service<| title == $::rabbitmq::params::service_name |> - File[$service_key] ~> Service<| title == $::rabbitmq::params::service_name |> } diff --git a/spec/classes/tripleo_certmonger_rabbitmq_spec.rb b/spec/classes/tripleo_certmonger_rabbitmq_spec.rb index 5c011ce1a..ca5d16d5c 100644 --- a/spec/classes/tripleo_certmonger_rabbitmq_spec.rb +++ b/spec/classes/tripleo_certmonger_rabbitmq_spec.rb @@ -33,10 +33,6 @@ describe 'tripleo::certmonger::rabbitmq' do is_expected.to contain_class('certmonger') end - it 'should include the rabbitmq parameters' do - is_expected.to contain_class('rabbitmq::params') - end - it 'should request a certificate' do is_expected.to contain_certmonger_certificate('rabbitmq').with( :ensure => 'present',