Merge "Missing rsyslog parameters for HAProxy" into stable/train

deployment/haproxy/haproxy-container-puppet.yaml

@@ -36,6 +36,12 @@ parameters:
     description: User for HAProxy stats endpoint
     default: admin
     type: string
+  HAProxyLoggingSource:
+    type: json
+    default:
+      tag: openstack.haproxy
+      file: /var/log/containers/haproxy/haproxy.log
+      startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}"
   HAProxySyslogAddress:
     default: /dev/log
     description: Syslog address where HAproxy will send its log
@@ -201,6 +207,10 @@ outputs:
               - null
           - get_attr: [HAProxyPublicTLS, role_data, config_settings]
           - get_attr: [HAProxyInternalTLS, role_data, config_settings]
+      service_config_settings:
+        rsyslog:
+          tripleo_logging_sources_haproxy:
+            - {get_param: HAProxyLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: haproxy

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -78,6 +78,12 @@ parameters:
   HAProxyInternalTLSKeysDirectory:
     default: '/etc/pki/tls/private/haproxy'
     type: string
+  HAProxyLoggingSource:
+    type: json
+    default:
+      tag: openstack.haproxy
+      file: /var/log/containers/haproxy/haproxy.log
+      startmsg.regex: "^[a-zA-Z]{3} [0-9]{2} [:0-9]{8}"
   HAProxySyslogAddress:
     default: /dev/log
     description: Syslog address where HAproxy will send its log
@@ -194,6 +200,10 @@ outputs:
                         expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
                     - {get_param: ContainerHAProxyImage}
                 expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
+      service_config_settings:
+        rsyslog:
+          tripleo_logging_sources_haproxy:
+            - {get_param: HAProxyLoggingSource}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: haproxy

releasenotes/notes/bug-1953672-haproxy-rsyslog-6f8e386f8909a253.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Rsyslog config for haproxy (https://bugs.launchpad.net/tripleo/+bug/1953672)