diff --git a/manifests/logging.pp b/manifests/logging.pp index 81c83bfb2..26d4b3197 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 @@ -105,6 +109,7 @@ class neutron::logging ( $debug = $::os_service_default, $use_syslog = $::os_service_default, $use_json = $::os_service_default, + $use_journal = $::os_service_default, $use_stderr = $::os_service_default, $log_file = $::os_service_default, $log_dir = '/var/log/neutron', @@ -141,6 +146,7 @@ class neutron::logging ( use_stderr => $use_stderr_real, use_syslog => $use_syslog_real, use_json => $use_json, + use_journal => $use_journal, syslog_log_facility => $syslog_log_facility, log_file => $log_file_real, log_dir => $log_dir_real, diff --git a/releasenotes/notes/add-use_journal-option-for-logging-b085a82ac60aef5f.yaml b/releasenotes/notes/add-use_journal-option-for-logging-b085a82ac60aef5f.yaml new file mode 100644 index 000000000..12b190e78 --- /dev/null +++ b/releasenotes/notes/add-use_journal-option-for-logging-b085a82ac60aef5f.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/neutron_logging_spec.rb b/spec/classes/neutron_logging_spec.rb index 022eff481..8b277f6b4 100644 --- a/spec/classes/neutron_logging_spec.rb +++ b/spec/classes/neutron_logging_spec.rb @@ -26,6 +26,7 @@ describe 'neutron::logging' do :log_date_format => '%Y-%m-%d %H:%M:%S', :use_syslog => false, :use_json => false, + :use_journal => true, :use_stderr => false, :syslog_log_facility => 'LOG_USER', :log_dir => '/var/log', @@ -58,6 +59,7 @@ describe 'neutron::logging' do is_expected.to contain_oslo__log('neutron_config').with( :use_syslog => '', :use_json => '', + :use_journal => '', :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/neutron', @@ -73,6 +75,7 @@ describe 'neutron::logging' do is_expected.to contain_oslo__log('neutron_config').with( :use_syslog => false, :use_json => false, + :use_journal => true, :use_stderr => false, :syslog_log_facility => 'LOG_USER', :log_dir => '/var/log',