diff --git a/manifests/init.pp b/manifests/init.pp index 511451ad..4572682e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -229,9 +229,6 @@ # # [*alarm_history_time_to_live*] # -# [*verbose*] -# (Optional) Deprecated. should the daemons log verbose messages. -# Defaults to undef. class ceilometer( $http_timeout = '600', $event_time_to_live = '-1', @@ -285,15 +282,11 @@ class ceilometer( # DEPRECATED PARAMETERS $alarm_history_time_to_live = undef, $metering_secret = undef, - $verbose = undef, ) { include ::ceilometer::logging include ::ceilometer::params - if $verbose { - warning('verbose is deprecated, has no effect and will be removed after Newton cycle.') - } # Cleanup in Ocata. if $telemetry_secret { validate_string($telemetry_secret) diff --git a/manifests/logging.pp b/manifests/logging.pp index d9851ca2..3eccc4a8 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -85,12 +85,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 ceilometer::logging( $use_syslog = $::os_service_default, $use_stderr = $::os_service_default, @@ -108,8 +102,6 @@ class ceilometer::logging( $instance_format = $::os_service_default, $instance_uuid_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 @@ -120,10 +112,6 @@ class ceilometer::logging( $log_dir_real = pick($::ceilometer::log_dir,$log_dir) $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': debug => $debug_real, use_stderr => $use_stderr_real, diff --git a/releasenotes/notes/remove_verbose-bc90fdffa0a9c0cc.yaml b/releasenotes/notes/remove_verbose-bc90fdffa0a9c0cc.yaml new file mode 100644 index 00000000..9a865cd5 --- /dev/null +++ b/releasenotes/notes/remove_verbose-bc90fdffa0a9c0cc.yaml @@ -0,0 +1,4 @@ +--- +other: + - The verbose option was marked to be removed in Ocata, + in Newton the option was deprecated.