diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-08-23 09:01:53 +0300 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-08-30 15:56:37 +0000 |
| commit | aaeace8c72ad7e9ea540c7055f0e16e2ed797f58 (patch) | |
| tree | ee6ffb8008645884ec14a51d9192badf7d0bdd6f /manifests/certmonger | |
| parent | e6f31aa6a8d88bc0b0b0f7ae44a8dad1b16d6a50 (diff) | |
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 351ab932514f13d7a139b0b41fdc4f6f7e990c8f)
Diffstat (limited to 'manifests/certmonger')
| -rw-r--r-- | manifests/certmonger/haproxy.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/certmonger/haproxy.pp b/manifests/certmonger/haproxy.pp index 819348d..266054f 100644 --- a/manifests/certmonger/haproxy.pp +++ b/manifests/certmonger/haproxy.pp @@ -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, |