Deprecate use_syslog

[DEFAULT/use_syslog] was deprecated in Mitaka [1]
init.pp logging.pp - deprecate use_syslog, add warning, remove reference
tests - remove use_syslog and [DEFAULT/use_syslog] verification.

[1]
http://docs.openstack.org/mitaka/config-reference/tables/conf-changes/keystone.html

Change-Id: Iac282eac4f581b1a16c8d73eadd904fbc6be32c4
This commit is contained in:
Iury Gregory Melo Ferreira 2016-05-22 00:27:39 -03:00
parent 4aba3e34f9
commit eb12a287be
4 changed files with 22 additions and 16 deletions

View File

@ -29,10 +29,6 @@
# (optional) Rather keystone should log at debug level.
# Defaults to undef.
#
# [*use_syslog*]
# (optional) Use syslog for logging.
# Defaults to undef.
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to undef.
@ -547,6 +543,10 @@
# (optional) Deprecated. Key size (in bits) for token signing cert (auto generated certificate)
# Defaults to $::os_service_default
#
# [*use_syslog*]
# (optional) DEPRECATED. Use syslog for logging.
# Defaults to undef.
#
# == Dependencies
# None
#
@ -586,7 +586,6 @@ class keystone(
$debug = undef,
$log_dir = undef,
$log_file = undef,
$use_syslog = undef,
$use_stderr = undef,
$log_facility = undef,
$catalog_type = 'sql',
@ -683,6 +682,7 @@ class keystone(
$signing_ca_key = $::os_service_default,
$signing_cert_subject = $::os_service_default,
$signing_key_size = $::os_service_default,
$use_syslog = undef,
) inherits keystone::params {
include ::keystone::deps
@ -696,6 +696,10 @@ class keystone(
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
}
if $use_syslog {
warning('use_syslog is deprecated, has no effect and will be removed in a future release.')
}
if ! $catalog_driver {
validate_re($catalog_type, 'template|sql')
}

View File

@ -8,10 +8,6 @@
# (Optional) Should the daemons log debug messages
# Defaults to $::os_service_default
#
# [*use_syslog*]
# (Optional) Use syslog for logging.
# Defaults to $::os_service_default
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to $::os_service_default
@ -108,9 +104,11 @@
# (Optional) Deprecated. Should the daemons log verbose messages
# Defaults to undef.
#
# [*use_syslog*]
# (Optional) Use syslog for logging.
# Defaults to undef
#
class keystone::logging(
$use_syslog = $::os_service_default,
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/keystone',
@ -131,6 +129,7 @@ class keystone::logging(
$watch_log_file = $::os_service_default,
# DEPRECATED
$verbose = undef,
$use_syslog = undef,
) {
include ::keystone::deps
@ -139,9 +138,12 @@ class keystone::logging(
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
}
if $use_syslog {
warning('use_syslog is deprecated, has no effect and will be removed in a future release.')
}
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use keystone::<myparam> first then keystone::logging::<myparam>.
$use_syslog_real = pick($::keystone::use_syslog,$use_syslog)
$use_stderr_real = pick($::keystone::use_stderr,$use_stderr)
$log_facility_real = pick($::keystone::log_facility,$log_facility)
$log_dir_real = pick($::keystone::log_dir,$log_dir)
@ -155,7 +157,6 @@ class keystone::logging(
log_file => $log_file_real,
log_dir => $log_dir_real,
watch_log_file => $watch_log_file,
use_syslog => $use_syslog_real,
syslog_log_facility => $log_facility_real,
use_stderr => $use_stderr_real,
logging_context_format_string => $logging_context_format_string,

View File

@ -0,0 +1,4 @@
---
deprecations:
- use_syslog in DEFAULT section was deprecated in Mitaka, this parameter
has no effect and will be removed in a future release.

View File

@ -23,7 +23,6 @@ describe 'keystone::logging' do
:instance_format => '[instance: %(uuid)s] ',
:instance_uuid_format => '[instance: %(uuid)s] ',
:log_date_format => '%Y-%m-%d %H:%M:%S',
:use_syslog => true,
:use_stderr => false,
:log_facility => 'LOG_FOO',
:log_dir => '/var/log',
@ -34,7 +33,6 @@ describe 'keystone::logging' do
shared_examples 'basic default logging settings' do
it 'configures glance logging settins with default values' do
is_expected.to contain_keystone_config('DEFAULT/use_syslog').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('DEFAULT/log_dir').with(:value => '/var/log/keystone')
is_expected.to contain_keystone_config('DEFAULT/log_file').with(:value => '<SERVICE DEFAULT>')
@ -44,7 +42,6 @@ describe 'keystone::logging' do
shared_examples 'basic non-default logging settings' do
it 'configures glance logging settins with non-default values' do
is_expected.to contain_keystone_config('DEFAULT/use_syslog').with(:value => 'true')
is_expected.to contain_keystone_config('DEFAULT/use_stderr').with(:value => 'false')
is_expected.to contain_keystone_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_FOO')
is_expected.to contain_keystone_config('DEFAULT/log_dir').with(:value => '/var/log')