Merge "Add option for enabling rsyslog reopenOnTruncate" into stable/victoria

This commit is contained in:
Zuul 2021-06-21 21:56:34 +00:00 committed by Gerrit Code Review
commit 3228d8fda4

View File

@ -37,6 +37,10 @@ parameters:
default: {}
description: Parameters specific to the role
type: json
RsyslogReopenOnTruncate:
default: false
description: Rsyslog imfile reopenOnTruncate parameter
type: boolean
RsyslogElasticsearchSetting:
default: {}
description: Configuration for rsyslog-elasticsearch plugin
@ -73,7 +77,6 @@ conditions:
- equals: [{get_param: RsyslogElasticsearchTlsCACert}, '']
- equals: [{get_param: RsyslogElasticsearchTlsClientCert}, '']
- equals: [{get_param: RsyslogElasticsearchTlsClientKey}, '']
outputs:
role_data:
description: Role data for the rsyslog role.
@ -182,7 +185,6 @@ outputs:
outname: region
value: {get_param: KeystoneRegion}
format: jsonf
tripleo::profile::base::logging::rsyslog::elasticsearch:
map_merge:
- {get_param: RsyslogElasticsearchSetting}
@ -190,6 +192,10 @@ outputs:
searchIndex: rsyslog-node-index
dynSearchIndex: "on"
errorfile: '/var/log/rsyslog/omelasticsearch.log'
- if:
- {get_param: RsyslogReopenOnTruncate}
- tripleo::profile::base::logging::rsyslog::reopen_on_truncate: "on"
- {}
- if:
- use_tls
- tripleo::profile::base::logging::rsyslog::elasticsearch_tls_ca_cert: {get_param: RsyslogElasticsearchTlsCACert}