summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-03 22:19:31 +0000
committerGerrit Code Review <review@openstack.org>2016-10-03 22:19:31 +0000
commit4ad03b75c5bb6b0c4a1760796f2b57a65b05eb59 (patch)
treef0ebd076c81930a10d0175aace084992441269d8 /puppet
parent5f7d913c101a518fa1011762ecb5df5590dcf129 (diff)
parentb74b6793d28beb67d63eb1eafa9ed36ed4e92335 (diff)
Merge "reload HAProxy config in HA setups when certificate is updated"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/extraconfig/tls/tls-cert-inject.yaml6
1 files changed, 2 insertions, 4 deletions
diff --git a/puppet/extraconfig/tls/tls-cert-inject.yaml b/puppet/extraconfig/tls/tls-cert-inject.yaml
index e281ef51..49d84574 100644
--- a/puppet/extraconfig/tls/tls-cert-inject.yaml
+++ b/puppet/extraconfig/tls/tls-cert-inject.yaml
@@ -64,11 +64,9 @@ resources:
| openssl md5 | cut -c 10- \
> ${heat_outputs_path}.key_modulus
# We need to reload haproxy in case the certificate changed because
- # puppet doesn't know the contents of the cert file. The pacemaker
- # case is handled separately in a pacemaker-specific resource.
- pacemaker_status=$(systemctl is-active pacemaker)
+ # puppet doesn't know the contents of the cert file.
haproxy_status=$(systemctl is-active haproxy)
- if [ "$pacemaker_status" != "active" -a "$haproxy_status" = "active"]; then
+ if [ "$haproxy_status" = "active" ]; then
systemctl reload haproxy
fi