From 1467ac82ab7ac4c0dc0038b15076ac47106f982a Mon Sep 17 00:00:00 2001
From: Caio Oliveira <caiobo@lsd.ufcg.edu.br>
Date: Tue, 27 Sep 2016 23:07:03 -0300
Subject: [PATCH] Remove verbose

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

Change-Id: Ibd066842d0c9f825c3f7a0220c58e003f4ee2d2e
---
 manifests/init.pp                                | 12 +-----------
 manifests/inspector/logging.pp                   | 11 -----------
 manifests/logging.pp                             | 16 ----------------
 .../notes/remove_verbose-cc22967ed7edbd00.yaml   |  5 +++++
 4 files changed, 6 insertions(+), 38 deletions(-)
 create mode 100644 releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index cf87f855..d991cf54 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -284,16 +284,11 @@
 #   Defaults to undef.
 #   Deprecated, use rabbit_userid instead.
 #
-# [*verbose*]
-#   (optional) Deprecated, Verbose logging
-#   Defaults to undef
-#
 # [*enabled_drivers*]
 #  (optional) Array of drivers to load during service
 #  initialization. Deprecated and moved to conductor.
 #  Defaults to undef
-
-
+#
 class ironic (
   $enabled                            = true,
   $package_ensure                     = 'present',
@@ -356,7 +351,6 @@ class ironic (
   $purge_config                       = false,
   # DEPRECATED PARAMETERS
   $rabbit_user                        = undef,
-  $verbose                            = undef,
   $enabled_drivers                    = undef,
 ) {
 
@@ -365,10 +359,6 @@ class ironic (
   include ::ironic::db
   include ::ironic::params
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   if $rabbit_user {
     warning('The rabbit_user parameter is deprecated. Please use rabbit_userid instead.')
     $rabbit_user_real = $rabbit_user
diff --git a/manifests/inspector/logging.pp b/manifests/inspector/logging.pp
index 1254fe05..d5ef3f0a 100644
--- a/manifests/inspector/logging.pp
+++ b/manifests/inspector/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 ironic::inspector::logging(
   $use_syslog                    = $::os_service_default,
   $use_stderr                    = $::os_service_default,
@@ -108,8 +102,6 @@ class ironic::inspector::logging(
   $instance_format               = $::os_service_default,
   $instance_uuid_format          = $::os_service_default,
   $log_date_format               = $::os_service_default,
-  #Deprecated
-  $verbose                       = undef,
 ) {
 
   include ::ironic::deps
@@ -121,9 +113,6 @@ class ironic::inspector::logging(
     $default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',')
   }
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
 
   ironic_inspector_config {
     'DEFAULT/debug':                         value => $debug_real;
diff --git a/manifests/logging.pp b/manifests/logging.pp
index f6f21ce8..edc6f454 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -4,10 +4,6 @@
 #
 # == parameters
 #
-#  [*verbose*]
-#    (Optional) Should the daemons log verbose messages
-#    Defaults to $::os_service_default
-#
 #  [*debug*]
 #    (Optional) Should the daemons log debug messages
 #    Defaults to $::os_service_default
@@ -89,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 ironic::logging(
   $use_syslog                    = $::os_service_default,
   $use_stderr                    = $::os_service_default,
@@ -112,8 +102,6 @@ class ironic::logging(
   $instance_format               = $::os_service_default,
   $instance_uuid_format          = $::os_service_default,
   $log_date_format               = $::os_service_default,
-  # Deprecated
-  $verbose                       = undef,
 ) {
 
   include ::ironic::deps
@@ -126,10 +114,6 @@ class ironic::logging(
   $log_dir_real = pick($::ironic::log_dir,$log_dir)
   $debug_real = pick($::ironic::debug,$debug)
 
-  if $verbose {
-    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
-  }
-
   oslo::log { 'ironic_config':
     debug                         => $debug_real,
     use_stderr                    => $use_stderr_real,
diff --git a/releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml b/releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml
new file mode 100644
index 00000000..710e9bf4
--- /dev/null
+++ b/releasenotes/notes/remove_verbose-cc22967ed7edbd00.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - This patch removes the verbose parameter. Since we are in Ocata
+    and this option was marked to be removed in this release.
+    In Newton the option was deprecated.