From 37a24bfe50c937fd527d4171dc66cfb1f7c3db46 Mon Sep 17 00:00:00 2001
From: Damien Ciabrini <dciabrin@redhat.com>
Date: Mon, 22 Mar 2021 18:23:10 +0100
Subject: [PATCH] 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
---
 deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml | 6 +++---
 deployment/haproxy/haproxy-public-tls-certmonger.yaml      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml
index 2dbf86037b..b32c485be8 100644
--- a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml
+++ b/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}
diff --git a/deployment/haproxy/haproxy-public-tls-certmonger.yaml b/deployment/haproxy/haproxy-public-tls-certmonger.yaml
index ae9721dbfc..bb444bf6f4 100644
--- a/deployment/haproxy/haproxy-public-tls-certmonger.yaml
+++ b/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}