openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Match only haproxy for docker ps and skipp all *-haproxy occurences" into stable/queens

This commit is contained in:
Zuul 2018-06-16 14:49:47 +00:00 committed by Gerrit Code Review
parent 5feb66ae5c a78f9f68ec
commit 7382dd869e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet/extraconfig/tls/tls-cert-inject.yaml
View File

@ -95,7 +95,7 @@ resources:
elif [[ $HAPROXY_TLS_UPDATE_NEEDED -eq 0 ]]; then
# Handles reloading HAProxy and fetching a new certificate if
# necessary
HAPROXY_CONTAINER_ID=$(docker ps | grep haproxy | awk '{print $1}')
HAPROXY_CONTAINER_ID=$(docker ps | grep '[[:space:]]haproxy' | awk '{print $1}')
if [[ -n "$HAPROXY_CONTAINER_ID" ]]; then
if [[ "$pacemaker_status" == "active" ]]; then
# We copy the certificate from the mount point to the desired