diff --git a/manifests/logging.pp b/manifests/logging.pp index a92e15fc9..a2262e428 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -37,10 +37,6 @@ # (Optional) File where logs should be stored. # 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*] # (Optional) Format string to use for log messages with context. # Defaults to $facts['os_service_default'] @@ -101,6 +97,12 @@ # 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 nova::logging( $use_syslog = $facts['os_service_default'], $use_json = $facts['os_service_default'], @@ -109,7 +111,6 @@ class nova::logging( $log_facility = $facts['os_service_default'], $log_dir = '/var/log/nova', $log_file = $facts['os_service_default'], - $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'], @@ -122,6 +123,8 @@ class nova::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 nova::deps diff --git a/releasenotes/notes/deprecate-watch_log_file-761812f9f9d1352c.yaml b/releasenotes/notes/deprecate-watch_log_file-761812f9f9d1352c.yaml new file mode 100644 index 000000000..1909306e5 --- /dev/null +++ b/releasenotes/notes/deprecate-watch_log_file-761812f9f9d1352c.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + The ``nova::logging::watch_log_file`` parameter has been deprecated. diff --git a/spec/classes/nova_logging_spec.rb b/spec/classes/nova_logging_spec.rb index 59ad9bd27..08e1aaff3 100644 --- a/spec/classes/nova_logging_spec.rb +++ b/spec/classes/nova_logging_spec.rb @@ -66,7 +66,6 @@ describe 'nova::logging' do :use_stderr => '<SERVICE DEFAULT>', :log_dir => '/var/log/nova', :log_file => '<SERVICE DEFAULT>', - :watch_log_file => '<SERVICE DEFAULT>', :debug => '<SERVICE DEFAULT>', ) end