openstack
/
puppet-vitrage
Code Issues Proposed changes

Merge "Remove deprecated logging"

This commit is contained in:
Zuul 2018-12-14 04:24:55 +00:00 committed by Gerrit Code Review
parent 5bfef1f3d6 93539eaf7a
commit 6475a8dd92
4 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
manifests/init.pp
View File

@ -150,28 +150,6 @@
# (Optional) Password for message broker authentication
# Defaults to $::os_service_default.
#
# [*log_dir*]
# (optional) Directory where logs should be stored.
# If set to boolean false or the $::os_service_default, it will not log to
# any directory.
# Defaults to undef.
#
# [*debug*]
# (optional) Set log output to debug output.
# Defaults to undef
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults to undef
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to undef
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to undef
#
# [*notification_transport_url*]
# (optional) A URL representing the messaging driver to use for notifications
# and its full configuration. Transport URLs take the form:
@ -233,11 +211,6 @@ class vitrage (
$amqp_sasl_config_name = $::os_service_default,
$amqp_username = $::os_service_default,
$amqp_password = $::os_service_default,
$debug = undef,
$use_syslog = undef,
$use_stderr = undef,
$log_facility = undef,
$log_dir = undef,
$notification_transport_url = $::os_service_default,
$notification_driver = $::os_service_default,
$notification_topics = $::os_service_default,
@ -247,7 +220,6 @@ class vitrage (
) inherits vitrage::params {
include ::vitrage::deps
include ::vitrage::logging
package { 'vitrage':
ensure => $package_ensure,

22
manifests/logging.pp
View File

@ -118,26 +118,14 @@ class vitrage::logging(
include ::vitrage::deps
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use vitrage::<myparam> first then vitrage::vitrage::<myparam>.
$use_syslog_real = pick($::vitrage::use_syslog,$use_syslog)
$use_stderr_real = pick($::vitrage::use_stderr,$use_stderr)
$log_facility_real = pick($::vitrage::log_facility,$log_facility)
if $log_dir != '' {
$log_dir_real = pick($::vitrage::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
$debug_real = pick($::vitrage::debug,$debug)
oslo::log { 'vitrage_config':
debug => $debug_real,
use_syslog => $use_syslog_real,
debug => $debug,
use_syslog => $use_syslog,
use_json => $use_json,
use_journal => $use_journal,
use_stderr => $use_stderr_real,
log_dir => $log_dir_real,
syslog_log_facility => $log_facility_real,
use_stderr => $use_stderr,
log_dir => $log_dir,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,
logging_debug_format_suffix => $logging_debug_format_suffix,

5
releasenotes/notes/remove-deprecated-logging-061c4b3656106675.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated parameters use_syslog, use_stderr, log_facility, log_dir and
debug in the init class is now removed. Please set them in the logging class.

5
spec/classes/vitrage_init_spec.rb
View File

@ -9,10 +9,6 @@ describe 'vitrage' do
{ :purge_config => false }
end
it 'contains the logging class' do
is_expected.to contain_class('vitrage::logging')
end
it 'contains the deps class' do
is_expected.to contain_class('vitrage::deps')
end
@ -50,7 +46,6 @@ describe 'vitrage' do
context 'with overridden parameters' do
let :params do
{
:debug => true,
:default_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
:rpc_response_timeout => '120',
:control_exchange => 'vitrage',