diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index 4236e942..c71dea03 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -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, diff --git a/manifests/logging.pp b/manifests/logging.pp index 2a2a7b0c..fc6861a2 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -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, diff --git a/releasenotes/notes/remove-watch_log_file-9340f97aff2c3f15.yaml b/releasenotes/notes/remove-watch_log_file-9340f97aff2c3f15.yaml new file mode 100644 index 00000000..b5f7dff0 --- /dev/null +++ b/releasenotes/notes/remove-watch_log_file-9340f97aff2c3f15.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The ``ironic::logging::watch_log_file`` parameter and + the ``ironic::inspector::logging::watch_log_file`` parameter have been + removed. diff --git a/spec/classes/ironic_inspector_logging_spec.rb b/spec/classes/ironic_inspector_logging_spec.rb index e9df143b..ee6e4adb 100644 --- a/spec/classes/ironic_inspector_logging_spec.rb +++ b/spec/classes/ironic_inspector_logging_spec.rb @@ -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 diff --git a/spec/classes/ironic_logging_spec.rb b/spec/classes/ironic_logging_spec.rb index b3951afc..bffeea92 100644 --- a/spec/classes/ironic_logging_spec.rb +++ b/spec/classes/ironic_logging_spec.rb @@ -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