diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp index d8359b41..d750ebce 100644 --- a/manifests/inspector/logging.pp +++ b/manifests/inspector/logging.pp @@ -29,6 +29,10 @@ # If set to $::os_service_default, it will not log to any directory. # Defaults to '/var/log/ironic-inspector' # +# [*log_file*] +# (Optional) File where logs should be stored. +# Defaults to $::os_service_default +# # [*logging_context_format_string*] # (optional) Format string to use for log messages with context. # Defaults to $::os_service_default @@ -95,6 +99,7 @@ class ironic::inspector::logging( $use_stderr = $::os_service_default, $log_facility = $::os_service_default, $log_dir = '/var/log/ironic-inspector', + $log_file = $::os_service_default, $debug = $::os_service_default, $logging_context_format_string = $::os_service_default, $logging_default_format_string = $::os_service_default, @@ -117,6 +122,7 @@ class ironic::inspector::logging( use_syslog => $use_syslog, use_json => $use_json, log_dir => $log_dir, + log_file => $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 83cbd2c8..b885c748 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -33,6 +33,10 @@ # If set to $::os_service_default, it will not log to any directory. # Defaults to '/var/log/ironic' # +# [*log_file*] +# (Optional) File where logs should be stored. +# Defaults to $::os_service_default +# # [*logging_context_format_string*] # (Optional) Format string to use for log messages with context. # Defaults to $::os_service_default @@ -100,6 +104,7 @@ class ironic::logging( $use_stderr = $::os_service_default, $log_facility = $::os_service_default, $log_dir = '/var/log/ironic', + $log_file = $::os_service_default, $debug = $::os_service_default, $logging_context_format_string = $::os_service_default, $logging_default_format_string = $::os_service_default, @@ -123,6 +128,7 @@ class ironic::logging( use_json => $use_json, use_journal => $use_journal, log_dir => $log_dir, + log_file => $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/add-log_file-for-logging-988963eb917c9ad9.yaml b/releasenotes/notes/add-log_file-for-logging-988963eb917c9ad9.yaml new file mode 100644 index 00000000..e40d4c81 --- /dev/null +++ b/releasenotes/notes/add-log_file-for-logging-988963eb917c9ad9.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add the log_file option for logging. diff --git a/spec/classes/ironic_inspector_logging_spec.rb b/spec/classes/ironic_inspector_logging_spec.rb index 390b762d..ee6e4adb 100644 --- a/spec/classes/ironic_inspector_logging_spec.rb +++ b/spec/classes/ironic_inspector_logging_spec.rb @@ -28,6 +28,7 @@ describe 'ironic::inspector::logging' do :use_stderr => false, :log_facility => 'LOG_FOO', :log_dir => '/var/log', + :log_file => '/var/log/ironic/ironic-inspector.log', :debug => true, } end @@ -62,6 +63,7 @@ describe 'ironic::inspector::logging' do :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/ironic-inspector', + :log_file => '', :debug => '', ) end @@ -75,6 +77,7 @@ describe 'ironic::inspector::logging' do :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log', + :log_file => '/var/log/ironic/ironic-inspector.log', :debug => true, ) end diff --git a/spec/classes/ironic_logging_spec.rb b/spec/classes/ironic_logging_spec.rb index 4751b2a6..bffeea92 100644 --- a/spec/classes/ironic_logging_spec.rb +++ b/spec/classes/ironic_logging_spec.rb @@ -29,6 +29,7 @@ describe 'ironic::logging' do :use_stderr => false, :log_facility => 'LOG_FOO', :log_dir => '/var/log', + :log_file => '/var/log/ironic/ironic.log', :debug => true, } end @@ -76,6 +77,7 @@ describe 'ironic::logging' do :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/ironic', + :log_file => '', :debug => '', ) end @@ -90,6 +92,7 @@ describe 'ironic::logging' do :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log', + :log_file => '/var/log/ironic/ironic.log', :debug => true, ) end