openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "haproxy: fix typo after migration of TLS to ansible role"

Browse Source
This commit is contained in:
Zuul 2021-03-25 05:49:58 +00:00 committed by Gerrit Code Review
commit b5ecde2f27
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 # Refresh the pem at the mount-point
{{container_cli}} cp $service_pem "$container_name:/var/lib/kolla/config_files/src-tls/$service_pem" {{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 # 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 # 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 # 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: params:
CERTSDIR: {get_param: HAProxyInternalTLSCertsDirectory} CERTSDIR: {get_param: HAProxyInternalTLSCertsDirectory}
KEYSDIR: {get_param: HAProxyInternalTLSKeysDirectory} 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 # Refresh the pem at the mount-point
{{container_cli}} cp $service_pem "$container_name:/var/lib/kolla/config_files/src-tls/$service_pem" {{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 # 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 # 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 # 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: params:
CERTSDIR: {get_param: HAProxyInternalTLSCertsDirectory} CERTSDIR: {get_param: HAProxyInternalTLSCertsDirectory}
KEYSDIR: {get_param: HAProxyInternalTLSKeysDirectory} KEYSDIR: {get_param: HAProxyInternalTLSKeysDirectory}