From eddf51e66af5fdcaee4d6b9e7cafa8c6decfd1a3 Mon Sep 17 00:00:00 2001
From: Alexey Deryugin <aderyugin@mirantis.com>
Date: Tue, 12 Apr 2016 19:06:49 +0300
Subject: [PATCH] Deprecate usage of verbose parameter

Since 'oslo_log/verbose' parameter is deprecated and has no effect,
it should not be set via puppet.

Change-Id: I2251d78ff15cc0265c15a3bf736b45993fd7e761
Related-Bug: #1562935
---
 manifests/init.pp                 | 10 +++++-----
 manifests/logging.pp              | 21 +++++++++++++--------
 spec/classes/nova_logging_spec.rb |  3 ---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index c8daa3d61..16b8406cb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -171,10 +171,6 @@
 #   On RHEL will be '/var/lib/nova/tmp' and on Debian '/var/lock/nova'
 #   Defaults to $::nova::params::lock_path
 #
-# [*verbose*]
-#   (optional) Set log output to verbose output.
-#   Defaults to undef
-#
 # [*debug*]
 #   (optional) Set log output to debug output.
 #   Defaults to undef
@@ -349,6 +345,10 @@
 #   (optional) Install nova utilities (Extra packages used by nova tools)
 #   Defaults to undef
 #
+# [*verbose*]
+#   (optional) Set log output to verbose output.
+#   Defaults to undef
+#
 class nova(
   $ensure_package                     = 'present',
   $database_connection                = undef,
@@ -389,7 +389,6 @@ class nova(
   $log_dir                            = undef,
   $state_path                         = '/var/lib/nova',
   $lock_path                          = $::nova::params::lock_path,
-  $verbose                            = undef,
   $debug                              = undef,
   $periodic_interval                  = '60',
   $report_interval                    = '10',
@@ -430,6 +429,7 @@ class nova(
   $qpid_protocol                      = undef,
   $qpid_tcp_nodelay                   = undef,
   $install_utilities                  = undef,
+  $verbose                            = undef,
 ) inherits nova::params {
 
   include ::nova::deps
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 00c5e11b0..06af30c0c 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,13 +85,19 @@
 #    (optional) Format string for %%(asctime)s in log records.
 #    Defaults to $::os_service_default
 #    Example: 'Y-%m-%d %H:%M:%S'
-
+#
+# DEPRECATED PARAMETERS
+#
+# [*verbose*]
+#   (optional) Should the daemons log verbose messages
+#   DEPRECATED: Parameter has no effect
+#   Defaults to undef
+#
 class nova::logging(
   $use_syslog                    = $::os_service_default,
   $use_stderr                    = $::os_service_default,
   $log_facility                  = $::os_service_default,
   $log_dir                       = '/var/log/nova',
-  $verbose                       = $::os_service_default,
   $debug                         = $::os_service_default,
   $logging_context_format_string = $::os_service_default,
   $logging_default_format_string = $::os_service_default,
@@ -108,6 +110,8 @@ class nova::logging(
   $instance_format               = $::os_service_default,
   $instance_uuid_format          = $::os_service_default,
   $log_date_format               = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $verbose                       = undef,
 ) {
 
   include ::nova::deps
@@ -118,13 +122,14 @@ class nova::logging(
   $use_stderr_real = pick($::nova::use_stderr,$use_stderr)
   $log_facility_real = pick($::nova::log_facility,$log_facility)
   $log_dir_real = pick($::nova::log_dir,$log_dir)
-  $verbose_real  = pick($::nova::verbose,$verbose)
   $debug_real = pick($::nova::debug,$debug)
 
+  if $verbose {
+    warning('verbose parameter is deprecated and has no effect. It\'s value will be ignored.')
+  }
 
   oslo::log { 'nova_config':
     debug                         => $debug_real,
-    verbose                       => $verbose_real,
     use_stderr                    => $use_stderr_real,
     use_syslog                    => $use_syslog_real,
     log_dir                       => $log_dir_real,
diff --git a/spec/classes/nova_logging_spec.rb b/spec/classes/nova_logging_spec.rb
index b96669982..26103a284 100644
--- a/spec/classes/nova_logging_spec.rb
+++ b/spec/classes/nova_logging_spec.rb
@@ -28,7 +28,6 @@ describe 'nova::logging' do
      :use_stderr => false,
      :log_facility => 'LOG_FOO',
      :log_dir => '/var/log',
-     :verbose => true,
      :debug => true,
     }
   end
@@ -60,7 +59,6 @@ describe 'nova::logging' do
       is_expected.to contain_nova_config('DEFAULT/use_syslog').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_nova_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_nova_config('DEFAULT/log_dir').with(:value => '/var/log/nova')
-      is_expected.to contain_nova_config('DEFAULT/verbose').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_nova_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
     end
   end
@@ -71,7 +69,6 @@ describe 'nova::logging' do
       is_expected.to contain_nova_config('DEFAULT/use_stderr').with(:value => 'false')
       is_expected.to contain_nova_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_FOO')
       is_expected.to contain_nova_config('DEFAULT/log_dir').with(:value => '/var/log')
-      is_expected.to contain_nova_config('DEFAULT/verbose').with(:value => 'true')
       is_expected.to contain_nova_config('DEFAULT/debug').with(:value => 'true')
     end
   end