Remove verbose
Since we are in Ocata we should remove the verbose option that was deprecated Change-Id: Ie34e021c8a9f1d61be0cc9c6f2f05af76fac24e6
This commit is contained in:
parent
765557b9dc
commit
a1b8f3b331
|
@ -229,9 +229,6 @@
|
||||||
#
|
#
|
||||||
# [*alarm_history_time_to_live*]
|
# [*alarm_history_time_to_live*]
|
||||||
#
|
#
|
||||||
# [*verbose*]
|
|
||||||
# (Optional) Deprecated. should the daemons log verbose messages.
|
|
||||||
# Defaults to undef.
|
|
||||||
class ceilometer(
|
class ceilometer(
|
||||||
$http_timeout = '600',
|
$http_timeout = '600',
|
||||||
$event_time_to_live = '-1',
|
$event_time_to_live = '-1',
|
||||||
|
@ -285,15 +282,11 @@ class ceilometer(
|
||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$alarm_history_time_to_live = undef,
|
$alarm_history_time_to_live = undef,
|
||||||
$metering_secret = undef,
|
$metering_secret = undef,
|
||||||
$verbose = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::ceilometer::logging
|
include ::ceilometer::logging
|
||||||
include ::ceilometer::params
|
include ::ceilometer::params
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
# Cleanup in Ocata.
|
# Cleanup in Ocata.
|
||||||
if $telemetry_secret {
|
if $telemetry_secret {
|
||||||
validate_string($telemetry_secret)
|
validate_string($telemetry_secret)
|
||||||
|
|
|
@ -85,12 +85,6 @@
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
# Example: 'Y-%m-%d %H:%M:%S'
|
# Example: 'Y-%m-%d %H:%M:%S'
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*verbose*]
|
|
||||||
# (Optional) Deprecated. Should the daemons log verbose messages
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
class ceilometer::logging(
|
class ceilometer::logging(
|
||||||
$use_syslog = $::os_service_default,
|
$use_syslog = $::os_service_default,
|
||||||
$use_stderr = $::os_service_default,
|
$use_stderr = $::os_service_default,
|
||||||
|
@ -108,8 +102,6 @@ class ceilometer::logging(
|
||||||
$instance_format = $::os_service_default,
|
$instance_format = $::os_service_default,
|
||||||
$instance_uuid_format = $::os_service_default,
|
$instance_uuid_format = $::os_service_default,
|
||||||
$log_date_format = $::os_service_default,
|
$log_date_format = $::os_service_default,
|
||||||
# Deprecated
|
|
||||||
$verbose = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
||||||
|
@ -120,10 +112,6 @@ class ceilometer::logging(
|
||||||
$log_dir_real = pick($::ceilometer::log_dir,$log_dir)
|
$log_dir_real = pick($::ceilometer::log_dir,$log_dir)
|
||||||
$debug_real = pick($::ceilometer::debug,$debug)
|
$debug_real = pick($::ceilometer::debug,$debug)
|
||||||
|
|
||||||
if $verbose {
|
|
||||||
warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
|
|
||||||
}
|
|
||||||
|
|
||||||
oslo::log { 'ceilometer_config':
|
oslo::log { 'ceilometer_config':
|
||||||
debug => $debug_real,
|
debug => $debug_real,
|
||||||
use_stderr => $use_stderr_real,
|
use_stderr => $use_stderr_real,
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
other:
|
||||||
|
- The verbose option was marked to be removed in Ocata,
|
||||||
|
in Newton the option was deprecated.
|
Loading…
Reference in New Issue