Merge "Missing rsyslog parameters for HAProxy" into stable/train
This commit is contained in:
commit
34cffb941c
|
@ -36,6 +36,12 @@ parameters:
|
||||||
description: User for HAProxy stats endpoint
|
description: User for HAProxy stats endpoint
|
||||||
default: admin
|
default: admin
|
||||||
type: string
|
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:
|
HAProxySyslogAddress:
|
||||||
default: /dev/log
|
default: /dev/log
|
||||||
description: Syslog address where HAproxy will send its log
|
description: Syslog address where HAproxy will send its log
|
||||||
|
@ -201,6 +207,10 @@ outputs:
|
||||||
- null
|
- null
|
||||||
- get_attr: [HAProxyPublicTLS, role_data, config_settings]
|
- get_attr: [HAProxyPublicTLS, role_data, config_settings]
|
||||||
- get_attr: [HAProxyInternalTLS, 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
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: haproxy
|
config_volume: haproxy
|
||||||
|
|
|
@ -78,6 +78,12 @@ parameters:
|
||||||
HAProxyInternalTLSKeysDirectory:
|
HAProxyInternalTLSKeysDirectory:
|
||||||
default: '/etc/pki/tls/private/haproxy'
|
default: '/etc/pki/tls/private/haproxy'
|
||||||
type: string
|
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:
|
HAProxySyslogAddress:
|
||||||
default: /dev/log
|
default: /dev/log
|
||||||
description: Syslog address where HAproxy will send its 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])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerHAProxyImage}
|
- {get_param: ContainerHAProxyImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
|
service_config_settings:
|
||||||
|
rsyslog:
|
||||||
|
tripleo_logging_sources_haproxy:
|
||||||
|
- {get_param: HAProxyLoggingSource}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: haproxy
|
config_volume: haproxy
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Rsyslog config for haproxy (https://bugs.launchpad.net/tripleo/+bug/1953672)
|
Loading…
Reference in New Issue