Merge "Remove verbose"

manifests/init.pp

@@ -248,12 +248,6 @@
 #   in the aodh config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*verbose*]
-#   (optional) Deprecated. Set log output to verbose output.
-#   Defaults to undef
-#
 class aodh (
   $ensure_package                     = 'present',
   $alarm_history_time_to_live         = $::os_service_default,
@@ -310,8 +304,6 @@ class aodh (
   $database_max_overflow              = undef,
   $gnocchi_url                        = $::os_service_default,
   $purge_config                       = false,
-  # DEPRECATED PARAMETERS
-  $verbose                            = undef,
 ) inherits aodh::params {
 
   include ::aodh::db
@@ -327,10 +319,6 @@ class aodh (
     purge  => $purge_config,
   }
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   if $rpc_backend == 'rabbit' {
     oslo::messaging::rabbit { 'aodh_config':
       rabbit_userid               => $rabbit_userid,

manifests/logging.pp

@@ -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 aodh::logging(
   $use_syslog                    = $::os_service_default,
   $use_stderr                    = $::os_service_default,
@@ -109,14 +103,8 @@ class aodh::logging(
   $instance_format               = $::os_service_default,
   $instance_uuid_format          = $::os_service_default,
   $log_date_format               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $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 aodh::<myparam> first then aodh::logging::<myparam>.
   $use_syslog_real   = pick($::aodh::use_syslog,$use_syslog)

releasenotes/notes/remove_verbose-62c2784e2c93656d.yaml

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