Merge "Deprecate verbose option in logging"

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' :
+nova_config { 'DEFAULT/image_service' :
-  value => true,
+  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
 

manifests/init.pp

@@ -488,6 +488,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')

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':

releasenotes/notes/verbose-deprecation-16e8fbc25c1d66b4.yaml

@@ -0,0 +1,4 @@
+---
+deprecations:
+  - verbose option is now deprecated for removal, the
+    parameter has no effect.

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',
       }

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',