Browse Source

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 1e65c3f4fc)
changes/16/737716/1
Michele Baldessari 10 months ago
parent
commit
c37d05692c
2 changed files with 0 additions and 8 deletions
  1. +0
    -4
      manifests/certmonger/rabbitmq.pp
  2. +0
    -4
      spec/classes/tripleo_certmonger_rabbitmq_spec.rb

+ 0
- 4
manifests/certmonger/rabbitmq.pp View File

@@ -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 |>
}

+ 0
- 4
spec/classes/tripleo_certmonger_rabbitmq_spec.rb View File

@@ -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',


Loading…
Cancel
Save