summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-31 01:51:53 +0000
committerGerrit Code Review <review@openstack.org>2017-08-31 01:51:53 +0000
commit2052f8e97d18ca6e9af2b93c8a6d6a47fca7a429 (patch)
tree24dec730c594b140b6d2555f526e96787509e286 /manifests
parentb99ccaddaf6a38883c7da525c005bd4977868ddd (diff)
parentaaeace8c72ad7e9ea540c7055f0e16e2ed797f58 (diff)
Merge "Certmonger: Only attempt to reload haproxy is it's active" into stable/pike
Diffstat (limited to 'manifests')
-rw-r--r--manifests/certmonger/haproxy.pp2
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,