Merge "Remove verbose"

This commit is contained in:
Jenkins 2016-10-24 18:40:18 +00:00 committed by Gerrit Code Review
commit 5eb9414ed4
3 changed files with 4 additions and 25 deletions

View File

@ -39,12 +39,6 @@
# in the gnocchi config.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*verbose*]
# (optional) Deprecated. Set log output to verbose output.
# Defaults to undef
#
class gnocchi (
$ensure_package = 'present',
$debug = undef,
@ -54,15 +48,8 @@ class gnocchi (
$log_facility = undef,
$database_connection = undef,
$purge_config = false,
# Deprecated
$verbose = undef,
) inherits gnocchi::params {
if $verbose {
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
}
include ::gnocchi::db
include ::gnocchi::logging

View File

@ -86,12 +86,6 @@
# Defaults to $::os_service_default
# example: 'y-%m-%d %h:%m:%s'
#
# DEPRECATED PARAMETERS
#
# [*verbose*]
# (Optional) Deprecated. Should the daemons log verbose messages
# Defaults to undef
#
class gnocchi::logging(
$use_syslog = $::os_service_default,
$use_stderr = $::os_service_default,
@ -109,14 +103,8 @@ class gnocchi::logging(
$instance_format = $::os_service_default,
$instance_uuid_format = $::os_service_default,
$log_date_format = $::os_service_default,
# Deprecated
$verbose = undef,
) {
if $verbose {
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
}
# note(spredzy): in order to keep backward compatibility we rely on the pick function
# to use gnocchi::<myparam> first then gnocchi::logging::<myparam>.
$use_syslog_real = pick($::gnocchi::use_syslog,$use_syslog)

View File

@ -0,0 +1,4 @@
---
other:
- The verbose option was marked to be removed in Ocata,
in Newton the option was deprecated.