Merge "Remove verbose"

manifests/init.pp

@@ -356,10 +356,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*verbose*]
-#   (optional) Deprecated. Verbose logging
-#   Defaults to undef
-#
 # [*log_facility*]
 #   (optional) Syslog facility to receive log lines
 #   Defaults to undef
@@ -458,7 +454,6 @@ class neutron (
   $notification_topics                  = $::os_service_default,
   $notification_transport_url           = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $verbose                              = undef,
   $log_facility                         = undef,
   $advertise_mtu                        = undef,
   $allow_pagination                     = undef,
@@ -472,10 +467,6 @@ class neutron (
     include ::neutron::logging
   }
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   if ! is_service_default($use_ssl) and ($use_ssl) {
     if is_service_default($cert_file) {
       fail('The cert_file parameter is required when use_ssl is set to true')

manifests/logging.pp

@@ -99,10 +99,6 @@
 #
 # DEPRECATED PARAMETERS
 #
-# [*verbose*]
-#   (optional) Deprecated. Verbose logging
-#   Defaults to undef
-#
 # [*log_facility*]
 #   (optional) Syslog facility to receive log lines
 #   Defaults to undef
@@ -128,7 +124,6 @@ class neutron::logging (
   $instance_uuid_format          = $::os_service_default,
   $fatal_deprecations            = $::os_service_default,
   # Deprecated
-  $verbose                       = undef,
   $log_facility                  = undef,
 ) {
 
@@ -140,10 +135,6 @@ class neutron::logging (
   $log_file_real = pick($::neutron::log_file,$log_file)
   $log_dir_real = pick($::neutron::log_dir,$log_dir)
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   if $log_facility {
     warning('log_facility is deprecated, has no effect and will be removed after Newton cycle. Please use syslog_log_facility instead.')
   }

releasenotes/notes/remove_verbose-a2969f741999c0e5.yaml

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