openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Enable to modify params of logrotate-crond.conf" into stable/train

This commit is contained in:
Zuul 2020-07-09 14:31:27 +00:00 committed by Gerrit Code Review
parent bd737a1131 c2899322dd
commit 1f8f4d9757
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/profile/base/logging/logrotate.pp
View File

@ -62,10 +62,18 @@
# (optional) Defaults to True. # (optional) Defaults to True.
# Configures the logrotate compress parameter. # Configures the logrotate compress parameter.
# #
# [*minsize*]
# (optional) Defaults to '1'.
# Configures the logrotate minsize parameter.
#
# [*maxsize*] # [*maxsize*]
# (optional) Defaults to '10M'. # (optional) Defaults to '10M'.
# Configures the logrotate maxsize parameter. # Configures the logrotate maxsize parameter.
# #
# [*notifempty*]
# (optional) Defaults to True.
# Configures the logrotate notifempty parameter.
#
# [*rotation*] # [*rotation*]
# (optional) Defaults to 'daily'. # (optional) Defaults to 'daily'.
# Configures the logrotate rotation interval. # Configures the logrotate rotation interval.
@ -111,7 +119,9 @@ class tripleo::profile::base::logging::logrotate (
$delaycompress = true, $delaycompress = true,
$compress = true, $compress = true,
$rotation = 'daily', $rotation = 'daily',
$minsize = 1,
$maxsize = '10M', $maxsize = '10M',
$notifempty = true,
$rotate = 14, $rotate = 14,
$purge_after_days = 14, $purge_after_days = 14,
$dateext = undef, $dateext = undef,

4
templates/logrotate/containers_logrotate.conf.erb
View File

@ -4,12 +4,14 @@
maxage <%= @purge_after_days %> maxage <%= @purge_after_days %>
# minsize 1 is required for GDPR compliance, all files in # minsize 1 is required for GDPR compliance, all files in
# /var/log/containers not managed with logrotate will be purged! # /var/log/containers not managed with logrotate will be purged!
minsize 1 minsize <%= @minsize %>
# Do not use size as it's not compatible with time-based rotation rules # Do not use size as it's not compatible with time-based rotation rules
# required for GDPR compliance. # required for GDPR compliance.
maxsize <%= @maxsize %> maxsize <%= @maxsize %>
missingok missingok
<%- if @notifempty %>
notifempty notifempty
<%- end %>
<%- if @copytruncate %> <%- if @copytruncate %>
copytruncate copytruncate
<%- end %> <%- end %>