1e65c3f4fc
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
79 lines
2.3 KiB
Puppet
79 lines
2.3 KiB
Puppet
# Copyright 2017 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
# == Class: tripleo::certmonger::rabbitmq
|
|
#
|
|
# Request a certificate for RabbitMQ and do the necessary setup.
|
|
#
|
|
# === Parameters
|
|
#
|
|
# [*hostname*]
|
|
# The hostname of the node. this will be set in the CN of the certificate.
|
|
#
|
|
# [*service_certificate*]
|
|
# The path to the certificate that will be used for TLS in this service.
|
|
#
|
|
# [*service_key*]
|
|
# The path to the key that will be used for TLS in this service.
|
|
#
|
|
# [*certmonger_ca*]
|
|
# (Optional) The CA that certmonger will use to generate the certificates.
|
|
# Defaults to hiera('certmonger_ca', 'local').
|
|
#
|
|
# [*postsave_cmd*]
|
|
# (Optional) Specifies the command to execute after requesting a certificate.
|
|
# Defaults to undef.
|
|
#
|
|
# [*principal*]
|
|
# (Optional) The service principal that is set for the service in kerberos.
|
|
# Defaults to undef
|
|
#
|
|
class tripleo::certmonger::rabbitmq (
|
|
$hostname,
|
|
$service_certificate,
|
|
$service_key,
|
|
$certmonger_ca = hiera('certmonger_ca', 'local'),
|
|
$postsave_cmd = undef,
|
|
$principal = undef,
|
|
) {
|
|
include ::certmonger
|
|
|
|
ensure_resource('file', '/usr/bin/certmonger-rabbitmq-refresh.sh', {
|
|
source => 'puppet:///modules/tripleo/certmonger-rabbitmq-refresh.sh',
|
|
mode => '0700',
|
|
seltype => 'bin_t',
|
|
notify => Service['certmonger']
|
|
})
|
|
|
|
certmonger_certificate { 'rabbitmq' :
|
|
ensure => 'present',
|
|
certfile => $service_certificate,
|
|
keyfile => $service_key,
|
|
hostname => $hostname,
|
|
dnsname => $hostname,
|
|
principal => $principal,
|
|
postsave_cmd => $postsave_cmd,
|
|
ca => $certmonger_ca,
|
|
wait => true,
|
|
require => Class['::certmonger'],
|
|
}
|
|
|
|
file { $service_certificate :
|
|
require => Certmonger_certificate['rabbitmq'],
|
|
}
|
|
file { $service_key :
|
|
require => Certmonger_certificate['rabbitmq'],
|
|
}
|
|
}
|