From f9f8f4ffec15b4556a14aacaf3dbb09432d1eadc Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Date: Tue, 27 Sep 2016 20:28:58 -0300
Subject: [PATCH] Remove verbose

Since we are in Ocata we should remove the
verbose option that was deprecated

Change-Id: I4b5914ee67cd9d5dafc00f99bebe3ae686ced2e9
---
 manifests/init.pp                                   | 13 -------------
 manifests/logging.pp                                | 12 ------------
 .../notes/remove_verbose-6f796fb4c2fde1e3.yaml      |  4 ++++
 3 files changed, 4 insertions(+), 25 deletions(-)
 create mode 100644 releasenotes/notes/remove_verbose-6f796fb4c2fde1e3.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 68481726..a1bcdc91 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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
 
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 377ff0f2..45feaf79 100644
--- a/manifests/logging.pp
+++ b/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 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)
diff --git a/releasenotes/notes/remove_verbose-6f796fb4c2fde1e3.yaml b/releasenotes/notes/remove_verbose-6f796fb4c2fde1e3.yaml
new file mode 100644
index 00000000..9a865cd5
--- /dev/null
+++ b/releasenotes/notes/remove_verbose-6f796fb4c2fde1e3.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - The verbose option was marked to be removed in Ocata,
+    in Newton the option was deprecated.