openstack/puppet-openstack-cookiecutter
Code Issues Proposed changes

logging: Drop watch_log_file

Browse Source 
This option was deprecated in oslo.log 6.0.0 [1].

[1] https://review.opendev.org/914788

Change-Id: I18d26f6bc59fe6007f40c5b410e2571c01b2b2f4
This commit is contained in:
Takashi Kajinami 2024-09-22 12:29:23 +09:00
parent 8fe204a3f0
commit 3f4c77b858
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet-{{cookiecutter.project_name}}/manifests/logging.pp
View File

@ -37,10 +37,6 @@
# (Optional) File where logs should be stored.
# Defaults to '/var/log/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.log'
#
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $facts['os_service_default']
#
# [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context.
# Defaults to $facts['os_service_default']
@ -113,7 +109,6 @@ class {{cookiecutter.project_name}}::logging(
$syslog_log_facility = $facts['os_service_default'],
$log_dir = '/var/log/{{cookiecutter.project_name}}',
$log_file = '/var/log/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.log',
$watch_log_file = $facts['os_service_default'],
$debug = $facts['os_service_default'],
$logging_context_format_string = $facts['os_service_default'],
$logging_default_format_string = $facts['os_service_default'],
@ -137,7 +132,6 @@ class {{cookiecutter.project_name}}::logging(
use_journal => $use_journal,
log_dir => $log_dir,
log_file => $log_file,
watch_log_file => $watch_log_file,
debug => $debug,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

3
puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb
View File

@ -28,7 +28,6 @@ describe '{{cookiecutter.project_name}}::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/tmp/{{cookiecutter.project_name}}_random.log',
:watch_log_file => true,
:debug => true,
}
end
@ -68,7 +67,6 @@ describe '{{cookiecutter.project_name}}::logging' do
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/{{cookiecutter.project_name}}',
:log_file => '/var/log/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.log',
:watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)}
end
@ -82,7 +80,6 @@ describe '{{cookiecutter.project_name}}::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/tmp/{{cookiecutter.project_name}}_random.log',
:watch_log_file => true,
:debug => true,
)}
end