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

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

Change-Id: I05856b25247280249d47918e70cdc8eb8890beeb
---
 manifests/init.pp                                    | 12 ------------
 manifests/logging.pp                                 | 12 ------------
 .../notes/remove_verbose-b6ae287286f00640.yaml       |  4 ++++
 3 files changed, 4 insertions(+), 24 deletions(-)
 create mode 100644 releasenotes/notes/remove_verbose-b6ae287286f00640.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 14202be..3472626 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -193,12 +193,6 @@
 #   in the mistral config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*verbose*]
-#   (Optional) DEPRECATED. Should the daemons log verbose messages
-#   Defaults to undef.
-#
 class mistral(
   $keystone_password,
   $keystone_user                      = 'mistral',
@@ -237,8 +231,6 @@ class mistral(
   $coordination_backend_url           = $::os_service_default,
   $coordination_heartbeat_interval    = $::os_service_default,
   $purge_config                       = false,
-  # Deprecated
-  $verbose                            = undef,
 ){
   include ::mistral::params
 
@@ -257,10 +249,6 @@ class mistral(
     purge => $purge_config,
   }
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   mistral_config {
     'keystone_authtoken/auth_uri':          value => $auth_uri;
     'keystone_authtoken/identity_uri':      value => $identity_uri;
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 207c88d..a6c8a46 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 mistral::logging(
   $use_syslog                    = $::os_service_default,
   $use_stderr                    = $::os_service_default,
@@ -109,8 +103,6 @@ class mistral::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
@@ -121,10 +113,6 @@ class mistral::logging(
   $log_dir_real = pick($::mistral::log_dir,$log_dir)
   $debug_real = pick($::mistral::debug,$debug)
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   oslo::log { 'mistral_config':
     use_syslog                    => $use_syslog_real,
     use_stderr                    => $use_stderr_real,
diff --git a/releasenotes/notes/remove_verbose-b6ae287286f00640.yaml b/releasenotes/notes/remove_verbose-b6ae287286f00640.yaml
new file mode 100644
index 0000000..9a865cd
--- /dev/null
+++ b/releasenotes/notes/remove_verbose-b6ae287286f00640.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - The verbose option was marked to be removed in Ocata,
+    in Newton the option was deprecated.