diff --git a/manifests/logging.pp b/manifests/logging.pp index 7b019005..b79d7307 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -16,6 +16,10 @@ # (Optional) Use json for logging. # Defaults to $::os_service_default # +# [*use_journal*] +# (Optional) Use journal for logging. +# Defaults to $::os_service_default +# # [*use_stderr*] # (optional) Use stderr for logging # Defaults to $::os_service_default @@ -92,6 +96,7 @@ class manila::logging( $use_syslog = $::os_service_default, $use_json = $::os_service_default, + $use_journal = $::os_service_default, $use_stderr = $::os_service_default, $log_facility = $::os_service_default, $log_dir = '/var/log/manila', @@ -127,6 +132,7 @@ class manila::logging( debug => $debug_real, use_syslog => $use_syslog_real, use_json => $use_json, + use_journal => $use_journal, use_stderr => $use_stderr_real, log_dir => $log_dir_real, syslog_log_facility => $log_facility_real, diff --git a/releasenotes/notes/add-use_journal-option-for-logging-b646bbb366ef8438.yaml b/releasenotes/notes/add-use_journal-option-for-logging-b646bbb366ef8438.yaml new file mode 100644 index 00000000..12b190e7 --- /dev/null +++ b/releasenotes/notes/add-use_journal-option-for-logging-b646bbb366ef8438.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Adds the use_journal option for configuring oslo.log. This will enable + passing the logs to journald. diff --git a/spec/classes/manila_logging_spec.rb b/spec/classes/manila_logging_spec.rb index c9380fad..c1084be3 100644 --- a/spec/classes/manila_logging_spec.rb +++ b/spec/classes/manila_logging_spec.rb @@ -25,6 +25,7 @@ describe 'manila::logging' do :log_date_format => '%Y-%m-%d %H:%M:%S', :use_syslog => true, :use_json => true, + :use_journal => true, :use_stderr => false, :log_facility => 'LOG_FOO', :log_dir => '/var/log', @@ -59,6 +60,7 @@ describe 'manila::logging' do is_expected.to contain_oslo__log('manila_config').with( :use_syslog => '', :use_json => '', + :use_journal => '', :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/manila', @@ -72,6 +74,7 @@ describe 'manila::logging' do is_expected.to contain_oslo__log('manila_config').with( :use_syslog => true, :use_json => true, + :use_journal => true, :use_stderr => false, :syslog_log_facility => 'LOG_FOO', :log_dir => '/var/log',