Browse Source

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

changes/30/782930/1
Zuul 6 months ago
committed by Gerrit Code Review
parent
commit
b5ecde2f27
  1. 6
      deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml
  2. 6
      deployment/haproxy/haproxy-public-tls-certmonger.yaml

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

@ -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

@ -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}

Loading…
Cancel
Save