openstack/puppet-oslo
Code Issues Proposed changes

Merge "Deprecate verbose option in logging"

Browse Source
This commit is contained in:
Jenkins
2016-05-18 10:17:32 +00:00
committed by Gerrit Code Review
parent defa811af8 b3d13ee3e3
commit 869f0c61a9
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/log.pp
View File

@@ -11,10 +11,6 @@
# (Optional) Should the daemons log debug messages # (Optional) Should the daemons log debug messages
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*verbose*]
# (Optional) Should the daemons log verbose messages
# Defaults to $::os_service_default
#
# [*log_config_append*] # [*log_config_append*]
# The name of an additional logging configuration file. # The name of an additional logging configuration file.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@@ -106,9 +102,14 @@
# (Optional) Enables or disables fatal status of deprecations (boolean value). # (Optional) Enables or disables fatal status of deprecations (boolean value).
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# DEPRECATED
#
# [*verbose*]
# (Optional) Deprecated. Should the daemons log verbose messages
# Defaults to undef.
#
define oslo::log( define oslo::log(
$debug = $::os_service_default, $debug = $::os_service_default,
$verbose = $::os_service_default,
$log_config_append = $::os_service_default, $log_config_append = $::os_service_default,
$log_date_format = $::os_service_default, $log_date_format = $::os_service_default,
$log_file = $::os_service_default, $log_file = $::os_service_default,
@@ -127,8 +128,14 @@ define oslo::log(
$instance_format = $::os_service_default, $instance_format = $::os_service_default,
$instance_uuid_format = $::os_service_default, $instance_uuid_format = $::os_service_default,
$fatal_deprecations = $::os_service_default, $fatal_deprecations = $::os_service_default,
# DEPRECATED
$verbose = undef,
){ ){
if $verbose {
warning('verbose is deprecated, has no effect and will be removed.')
}
if is_service_default($default_log_levels) { if is_service_default($default_log_levels) {
$default_log_levels_real = $default_log_levels $default_log_levels_real = $default_log_levels
} else { } else {
@@ -138,7 +145,6 @@ define oslo::log(
$log_options = { $log_options = {
'DEFAULT/debug' => { value => $debug }, 'DEFAULT/debug' => { value => $debug },
'DEFAULT/verbose' => { value => $verbose },
'DEFAULT/log_config_append' => { value => $log_config_append }, 'DEFAULT/log_config_append' => { value => $log_config_append },
'DEFAULT/log_date_format' => { value => $log_date_format }, 'DEFAULT/log_date_format' => { value => $log_date_format },
'DEFAULT/log_file' => { value => $log_file }, 'DEFAULT/log_file' => { value => $log_file },

3
spec/defines/oslo_log_spec.rb
View File

@@ -9,7 +9,6 @@ describe 'oslo::log' do
context 'with default parameters' do context 'with default parameters' do
it 'configure oslo_log default params' do it 'configure oslo_log default params' do
is_expected.to contain_keystone_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/verbose').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/log_config_append').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('DEFAULT/log_config_append').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('<SERVICE DEFAULT>')
@@ -34,7 +33,6 @@ describe 'oslo::log' do
context 'with overridden parameters' do context 'with overridden parameters' do
let :params do let :params do
{ :debug => true, { :debug => true,
:verbose => true,
:log_config_append => '/var/log/keystone/keystone.log', :log_config_append => '/var/log/keystone/keystone.log',
:log_date_format => '%Y-%m-%d %H:%M:%S', :log_date_format => '%Y-%m-%d %H:%M:%S',
:log_file => '/var/log/keystone/keystone.log', :log_file => '/var/log/keystone/keystone.log',
@@ -61,7 +59,6 @@ describe 'oslo::log' do
it 'configures logging' do it 'configures logging' do
is_expected.to contain_keystone_config('DEFAULT/debug').with_value(true) is_expected.to contain_keystone_config('DEFAULT/debug').with_value(true)
is_expected.to contain_keystone_config('DEFAULT/verbose').with_value(true)
is_expected.to contain_keystone_config('DEFAULT/log_config_append').with_value('/var/log/keystone/keystone.log') is_expected.to contain_keystone_config('DEFAULT/log_config_append').with_value('/var/log/keystone/keystone.log')
is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('%Y-%m-%d %H:%M:%S') is_expected.to contain_keystone_config('DEFAULT/log_date_format').with_value('%Y-%m-%d %H:%M:%S')
is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('/var/log/keystone/keystone.log') is_expected.to contain_keystone_config('DEFAULT/log_file').with_value('/var/log/keystone/keystone.log')