openstack
/
puppet-tripleo
Code Issues Proposed changes

Certmonger: Only attempt to reload haproxy is it's active 

Previously, certmonger tried to reload haproxy every time after a
certificate is requested. This is useful for certificate resubmits or
renewals. However, it turned out problematic on installation, when
haproxy is not yet active, as it would try many times and end up having
a race-condition with puppet.

This checks if haproxy is active and only then will it attempt to reload
it.

Change-Id: I51f9cccb5d1518a9647778e7bf6f9426a02ceb60
Closes-Bug: #1712377
(cherry picked from commit 351ab93251)
This commit is contained in:
Juan Antonio Osorio Robles 2017-08-23 09:01:53 +03:00 committed by Emilien Macchi
parent e6f31aa6a8
commit aaeace8c72
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/certmonger/haproxy.pp
View File

@ -74,7 +74,7 @@ define tripleo::certmonger::haproxy (
$dnsnames_real = $hostname
}
$postsave_cmd_real = pick($postsave_cmd, 'systemctl reload haproxy')
$postsave_cmd_real = pick($postsave_cmd, 'if systemctl -q is-active haproxy; then systemctl reload haproxy; else true; fi')
certmonger_certificate { "${title}-cert":
ensure => 'present',
ca => $certmonger_ca,