openstack
/
tripleo-heat-templates
Code Issues Proposed changes

haproxy: fix typo after migration of TLS to ansible role 

There are some typos in the post_script that gets called
when certmonger renews the HAProxy certificates. Fix them.

Change-Id: Ie9a64feddf7483036983f242d477fc8bdb6dbc1f
This commit is contained in:
Damien Ciabrini 2021-03-22 18:23:10 +01:00
parent 1f128e903d
commit 37a24bfe50
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml
View File

@ -138,11 +138,11 @@ outputs:
# Refresh the pem at the mount-point
{{container_cli}} cp $service_pem "$container_name:/var/lib/kolla/config_files/src-tls/$service_pem"
# Copy the new pem from the mount-point to the real path
{{container_cli}} exec $container_name" cp "/var/lib/kolla/config_files/src-tls$service_pem" "$service_pem"
{{container_cli}} exec "$container_name" cp "/var/lib/kolla/config_files/src-tls$service_pem" "$service_pem"
# Set appropriate permissions
{{container_cli}} exec $container_name" chown haproxy:haproxy "$service_pem"
{{container_cli}} exec "$container_name" chown haproxy:haproxy "$service_pem"
# Trigger a reload for HAProxy to read the new certificates
{{container_cli}} kill --signal HUP $container_name"
{{container_cli}} kill --signal HUP "$container_name"
params:
CERTSDIR: {get_param: HAProxyInternalTLSCertsDirectory}
KEYSDIR: {get_param: HAProxyInternalTLSKeysDirectory}

6
deployment/haproxy/haproxy-public-tls-certmonger.yaml
View File

@ -142,11 +142,11 @@ outputs:
# Refresh the pem at the mount-point
{{container_cli}} cp $service_pem "$container_name:/var/lib/kolla/config_files/src-tls/$service_pem"
# Copy the new pem from the mount-point to the real path
{{container_cli}} exec $container_name" cp "/var/lib/kolla/config_files/src-tls$service_pem" "$service_pem"
{{container_cli}} exec "$container_name" cp "/var/lib/kolla/config_files/src-tls$service_pem" "$service_pem"
# Set appropriate permissions
{{container_cli}} exec $container_name" chown haproxy:haproxy "$service_pem"
{{container_cli}} exec "$container_name" chown haproxy:haproxy "$service_pem"
# Trigger a reload for HAProxy to read the new certificates
{{container_cli}} kill --signal HUP $container_name"
{{container_cli}} kill --signal HUP "$container_name"
params:
CERTSDIR: {get_param: HAProxyInternalTLSCertsDirectory}
KEYSDIR: {get_param: HAProxyInternalTLSKeysDirectory}