httpd: Remove default post-save command for certmonger

The default command didn't work, so we need to fix that.

Related-Bug: #1811401
Needed-By: I862f0d15f769167c8b5d27cf302b7087b8fad0ab
Change-Id: I642f48aa0e66ca57de2ecee921c798747ba41e1a
(cherry picked from commit f1f4a6ccb8)
This commit is contained in:
Juan Antonio Osorio Robles 2019-01-25 11:13:24 +02:00 committed by Grzegorz Grasza
parent e2aba0f5a7
commit 21b6a8bc3d
2 changed files with 8 additions and 10 deletions

View File

@ -62,7 +62,6 @@ define tripleo::certmonger::httpd (
$dnsnames_real = $hostname
}
$postsave_cmd_real = pick($postsave_cmd, "systemctl reload ${::apache::params::service_name}")
certmonger_certificate { $name :
ensure => 'present',
certfile => $service_certificate,
@ -70,7 +69,7 @@ define tripleo::certmonger::httpd (
hostname => $hostname,
dnsname => $dnsnames_real,
principal => $principal,
postsave_cmd => $postsave_cmd_real,
postsave_cmd => $postsave_cmd,
ca => $certmonger_ca,
wait => true,
tag => 'apache-cert',

View File

@ -38,11 +38,6 @@
# it will create.
# Defaults to hiera('apache_certificate_specs', {}).
#
# [*apache_postsave_cmd*]
# (Optional) If set, it overrides the default way to restart apache when the
# certificate is renewed.
# Defaults to undef
#
# [*haproxy_certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
# it will create.
@ -125,9 +120,13 @@
# certificate is renewed.
# Defaults to undef
#
# [*apache_postsave_cmd*]
# (Optional) If set, it overrides the default way to restart apache when the
# certificate is renewed.
# Defaults to undef
#
class tripleo::profile::base::certmonger_user (
$apache_certificates_specs = hiera('apache_certificates_specs', {}),
$apache_postsave_cmd = undef,
$haproxy_certificates_specs = hiera('tripleo::profile::base::haproxy::certificates_specs', {}),
$libvirt_certificates_specs = hiera('libvirt_certificates_specs', {}),
$libvirt_postsave_cmd = undef,
@ -145,6 +144,7 @@ class tripleo::profile::base::certmonger_user (
$novnc_proxy_postsave_cmd = undef,
# Deprecated
$haproxy_postsave_cmd = undef,
$apache_postsave_cmd = undef,
) {
unless empty($haproxy_certificates_specs) {
$reload_haproxy = ['systemctl reload haproxy']
@ -167,8 +167,7 @@ class tripleo::profile::base::certmonger_user (
$apache_certificates_specs_filtered = $apache_certificates_specs.filter | $specs, $keys | { ! empty($keys[hostname]) }
unless empty($apache_certificates_specs_filtered) {
include ::tripleo::certmonger::apache_dirs
ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs_filtered,
{'postsave_cmd' => $apache_postsave_cmd})
ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs_filtered)
}
unless empty($libvirt_certificates_specs) {
include ::tripleo::certmonger::libvirt_dirs