openstack/puppet-ironic
Code Issues Proposed changes

Remove watch_log_file

Browse Source 
The option was deprecated during the 2024.2 cycle[1]. Processes may
fail to start when it is set to True[2] so supporting it is no longer
useful.

[1] 31603ac6dacd0b47ec9f02d99bfdd0a7b683119c
[2] b977cb9becbeaaa67bb663bd8db5aa6846e495b9

Change-Id: I14d2802b21e3e5a64eacf6d4de50aed8837d7f6c
This commit is contained in:
Takashi Kajinami
2025-04-16 20:53:32 +09:00
parent ddf7f7976e
commit 1e77e74798
5 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/inspector/logging.pp
View File

@@ -93,12 +93,6 @@
# Defaults to $facts['os_service_default']
# 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 ironic::inspector::logging(
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
@@ -118,8 +112,6 @@ class ironic::inspector::logging(
$instance_format = $facts['os_service_default'],
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$watch_log_file = undef,
) {
include ironic::deps
@@ -131,7 +123,6 @@ class ironic::inspector::logging(
use_json => $use_json,
log_dir => $log_dir,
log_file => $log_file,
watch_log_file => $watch_log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

9
manifests/logging.pp
View File

@@ -97,12 +97,6 @@
# Defaults to $facts['os_service_default']
# 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 ironic::logging(
$use_syslog = $facts['os_service_default'],
$use_json = $facts['os_service_default'],
@@ -123,8 +117,6 @@ class ironic::logging(
$instance_format = $facts['os_service_default'],
$instance_uuid_format = $facts['os_service_default'],
$log_date_format = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$watch_log_file = undef,
) {
include ironic::deps
@@ -137,7 +129,6 @@ class ironic::logging(
use_journal => $use_journal,
log_dir => $log_dir,
log_file => $log_file,
watch_log_file => $watch_log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,

6
releasenotes/notes/remove-watch_log_file-9340f97aff2c3f15.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
upgrade:
- |
The ``ironic::logging::watch_log_file`` parameter and
the ``ironic::inspector::logging::watch_log_file`` parameter have been
removed.

2
spec/classes/ironic_inspector_logging_spec.rb
View File

@@ -29,7 +29,6 @@ describe 'ironic::inspector::logging' do
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic-inspector.log',
:watch_log_file => true,
:debug => true,
}
end
@@ -79,7 +78,6 @@ describe 'ironic::inspector::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic-inspector.log',
:watch_log_file => true,
:debug => true,
)
end

2
spec/classes/ironic_logging_spec.rb
View File

@@ -30,7 +30,6 @@ describe 'ironic::logging' do
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic.log',
:watch_log_file => true,
:debug => true,
}
end
@@ -94,7 +93,6 @@ describe 'ironic::logging' do
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:log_file => '/var/log/ironic/ironic.log',
:watch_log_file => true,
:debug => true,
)
end