From 05e25fdadc636a2387dfb82cc5c1687d3e4eb86b Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Date: Tue, 17 May 2016 23:58:14 -0300
Subject: [PATCH] Deprecate verbose option in logging

Option "verbose" from group "DEFAULT" is deprecated for removal.
The parameter has no effect.
Deprecated verbose for logging and init
Remove verbose in README
Remove verbose from tests.
If this option is not set explicitly, there is no such warning.

Change-Id: If60ca414d4f7cc7bd50aafb9a9ac8b328b5b5c84
---
 README.md                                                  | 7 +++----
 manifests/init.pp                                          | 4 ++++
 manifests/logging.pp                                       | 2 +-
 .../notes/verbose-deprecation-16e8fbc25c1d66b4.yaml        | 4 ++++
 spec/acceptance/nova_wsgi_apache_spec.rb                   | 1 -
 spec/classes/nova_init_spec.rb                             | 3 +--
 6 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/verbose-deprecation-16e8fbc25c1d66b4.yaml

diff --git a/README.md b/README.md
index ed91dc77a..05ee4d7ba 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,6 @@ class { 'nova':
   rabbit_password     => 'an_even_bigger_secret',
   image_service       => 'nova.image.glance.GlanceImageService',
   glance_api_servers  => 'localhost:9292',
-  verbose             => false,
   rabbit_host         => '127.0.0.1',
 }
 
@@ -75,12 +74,12 @@ nova is a combination of Puppet manifest and ruby code to delivery configuration
 The `nova_config` provider is a children of the ini_setting provider. It allows one to write an entry in the `/etc/nova/nova.conf` file.
 
 ```puppet
-nova_config { 'DEFAULT/verbose' :
-  value => true,
+nova_config { 'DEFAULT/image_service' :
+  value => nova.image.glance.GlanceImageService,
 }
 ```
 
-This will write `verbose=true` in the `[DEFAULT]` section.
+This will write `image_service=nova.image.glance.GlanceImageService` in the `[DEFAULT]` section.
 
 ##### name
 
diff --git a/manifests/init.pp b/manifests/init.pp
index 42916e796..7ff55341f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -408,6 +408,10 @@ class nova(
       warning('enabled_ssl_apis is empty but use_ssl is set to true')
   }
 
+  if $verbose {
+    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
+  }
+
   if $use_ssl {
     if !$cert_file {
       fail('The cert_file parameter is required when use_ssl is set to true')
diff --git a/manifests/logging.pp b/manifests/logging.pp
index 05eb9c034..5defa53c3 100644
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -124,7 +124,7 @@ class nova::logging(
   $debug_real = pick($::nova::debug,$debug)
 
   if $verbose {
-    warning('verbose parameter is deprecated and has no effect. It\'s value will be ignored.')
+    warning('verbose is deprecated, has no effect and will be removed after Newton cycle.')
   }
 
   oslo::log { 'nova_config':
diff --git a/releasenotes/notes/verbose-deprecation-16e8fbc25c1d66b4.yaml b/releasenotes/notes/verbose-deprecation-16e8fbc25c1d66b4.yaml
new file mode 100644
index 000000000..ecfc2567f
--- /dev/null
+++ b/releasenotes/notes/verbose-deprecation-16e8fbc25c1d66b4.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - verbose option is now deprecated for removal, the
+    parameter has no effect.
diff --git a/spec/acceptance/nova_wsgi_apache_spec.rb b/spec/acceptance/nova_wsgi_apache_spec.rb
index c01f10d28..93d0174b4 100644
--- a/spec/acceptance/nova_wsgi_apache_spec.rb
+++ b/spec/acceptance/nova_wsgi_apache_spec.rb
@@ -35,7 +35,6 @@ describe 'basic nova' do
         rabbit_password         => 'an_even_bigger_secret',
         image_service           => 'nova.image.glance.GlanceImageService',
         glance_api_servers      => 'localhost:9292',
-        verbose                 => true,
         debug                   => true,
         rabbit_host             => '127.0.0.1',
       }
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index 880dc1ba8..2f2c5688f 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -78,8 +78,7 @@ describe 'nova' do
     context 'with overridden parameters' do
 
       let :params do
-        { :verbose                            => true,
-          :debug                              => true,
+        { :debug                              => true,
           :log_dir                            => '/var/log/nova2',
           :image_service                      => 'nova.image.local.LocalImageService',
           :rpc_backend                        => 'rabbit',