openstack/puppet-ceilometer
Code Issues Proposed changes

logging: Deprecate watch_log_file

Browse Source 
This option was deprecated in oslo.log 6.0.0 [1]. Because the warning
to catch usage of the parameter is implemented in the underlying
oslo::log defined resource type, no additional warning message is
implemented in this module.

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

Depends-on: https://review.opendev.org/930126
Change-Id: Ife1561c400762a6338dd136b8df7db9973cdcab8
This commit is contained in:
Takashi Kajinami 2024-09-22 01:47:54 +09:00
parent 725e12c270
commit 8ecd59cb43
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/logging.pp
View File

@ -37,10 +37,6 @@
# (Optional) File where logs should be stored. # (Optional) File where logs should be stored.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to $facts['os_service_default']
#
# [*logging_context_format_string*] # [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context. # (Optional) Format string to use for log messages with context.
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
@ -101,6 +97,12 @@
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# Example: 'Y-%m-%d %H:%M:%S' # Example: 'Y-%m-%d %H:%M:%S'
# #
# DEPRECATED PARAMETERS
#
# [*watch_log_file*]
# (Optional) Uses logging handler designed to watch file system (boolean value).
# Defaults to undef
#
class ceilometer::logging( class ceilometer::logging(
$use_syslog = $facts['os_service_default'], $use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'], $use_json = $facts['os_service_default'],
@ -109,7 +111,6 @@ class ceilometer::logging(
$log_facility = $facts['os_service_default'], $log_facility = $facts['os_service_default'],
$log_dir = '/var/log/ceilometer', $log_dir = '/var/log/ceilometer',
$log_file = $facts['os_service_default'], $log_file = $facts['os_service_default'],
$watch_log_file = $facts['os_service_default'],
$debug = $facts['os_service_default'], $debug = $facts['os_service_default'],
$logging_context_format_string = $facts['os_service_default'], $logging_context_format_string = $facts['os_service_default'],
$logging_default_format_string = $facts['os_service_default'], $logging_default_format_string = $facts['os_service_default'],
@ -122,6 +123,8 @@ class ceilometer::logging(
$instance_format = $facts['os_service_default'], $instance_format = $facts['os_service_default'],
$instance_uuid_format = $facts['os_service_default'], $instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'], $log_date_format = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$watch_log_file = undef,
) { ) {
include ceilometer::deps include ceilometer::deps

4
releasenotes/notes/deprecate-watch_log_file-9b8ae905c622f152.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
The ``ceilometer::logging::watch_log_file`` parameter has been deprecated.

1
spec/classes/ceilometer_logging_spec.rb
View File

@ -67,7 +67,6 @@ describe 'ceilometer::logging' do
:syslog_log_facility => '<SERVICE DEFAULT>', :syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ceilometer', :log_dir => '/var/log/ceilometer',
:log_file => '<SERVICE DEFAULT>', :log_file => '<SERVICE DEFAULT>',
:watch_log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>', :debug => '<SERVICE DEFAULT>',
) )
end end