From 6de4e204a1ec32812021309482fae9e1f7281b00 Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Wed, 31 Jul 2013 00:40:17 +0000
Subject: [PATCH] Adds Support for Debug Logging

Previously, debug logging was configurable for most openstack
classes.  This change adds the remaining classes that can be
configured for debug-level logging.

Defaults to false for backwards compatibility and to disable debug
level logging.

Change-Id: I51493f2bc536dd1923fd5f95b89cc9357a9ec0d2
---
 manifests/cinder/storage.pp                   |  2 ++
 manifests/quantum.pp                          |  3 +++
 spec/classes/openstack_cinder_storage_spec.rb |  1 +
 spec/classes/openstack_quantum_spec.rb        | 10 ++++++----
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/manifests/cinder/storage.pp b/manifests/cinder/storage.pp
index acf45db..74637b9 100644
--- a/manifests/cinder/storage.pp
+++ b/manifests/cinder/storage.pp
@@ -17,6 +17,7 @@ class openstack::cinder::storage(
   $volume_driver         = 'iscsi',
   $iscsi_ip_address      = '127.0.0.1',
   $setup_test_volume     = false,
+  $debug                 = false,
   $verbose               = false
 ) {
 
@@ -30,6 +31,7 @@ class openstack::cinder::storage(
     rabbit_virtual_host => $rabbit_virtual_host,
     package_ensure      => $package_ensure,
     api_paste_config    => $api_paste_config,
+    debug               => $debug,
     verbose             => $verbose,
   }
 
diff --git a/manifests/quantum.pp b/manifests/quantum.pp
index b93dfdc..db649ce 100644
--- a/manifests/quantum.pp
+++ b/manifests/quantum.pp
@@ -248,11 +248,13 @@ class openstack::quantum (
   if $enable_dhcp_agent {
     class { 'quantum::agents::dhcp':
       use_namespaces => true,
+      debug          => $debug,
     }
   }
   if $enable_l3_agent {
     class { 'quantum::agents::l3':
       use_namespaces => true,
+      debug          => $debug,
     }
   }
 
@@ -265,6 +267,7 @@ class openstack::quantum (
       shared_secret  => $shared_secret,
       auth_url       => $auth_url,
       metadata_ip    => $metadata_ip,
+      debug          => $debug,
     }
   }
 
diff --git a/spec/classes/openstack_cinder_storage_spec.rb b/spec/classes/openstack_cinder_storage_spec.rb
index ee6f222..b24722d 100644
--- a/spec/classes/openstack_cinder_storage_spec.rb
+++ b/spec/classes/openstack_cinder_storage_spec.rb
@@ -24,6 +24,7 @@ describe 'openstack::cinder::storage' do
       :rabbit_virtual_host => '/',
       :package_ensure      => 'present',
       :api_paste_config    => '/etc/cinder/api-paste.ini',
+      :debug               => false,
       :verbose             => false
     )
     should contain_class('cinder::volume').with(
diff --git a/spec/classes/openstack_quantum_spec.rb b/spec/classes/openstack_quantum_spec.rb
index 5feb982..0ae9c38 100644
--- a/spec/classes/openstack_quantum_spec.rb
+++ b/spec/classes/openstack_quantum_spec.rb
@@ -34,7 +34,6 @@ describe 'openstack::quantum' do
         :rabbit_virtual_host => '/',
         :rabbit_user         => 'rabbit_user',
         :rabbit_password     => 'rabbit_pass',
-        :debug               => false,
         :verbose             => false,
         :debug               => false
       )
@@ -94,7 +93,8 @@ describe 'openstack::quantum' do
       params.merge!(:enable_dhcp_agent => true)
     end
     it { should contain_class('quantum::agents::dhcp').with(
-      :use_namespaces => true
+      :use_namespaces => true,
+      :debug          => false
     ) }
   end
 
@@ -103,7 +103,8 @@ describe 'openstack::quantum' do
       params.merge!(:enable_l3_agent => true)
     end
     it { should contain_class('quantum::agents::l3').with(
-      :use_namespaces => true
+      :use_namespaces => true,
+      :debug          => false
     ) }
   end
 
@@ -128,7 +129,8 @@ describe 'openstack::quantum' do
         :auth_password  => 'q_user_pass',
         :shared_secret  => 'foo',
         :auth_url       => 'http://localhost:35357/v2.0',
-        :metadata_ip    => '127.0.0.1'
+        :metadata_ip    => '127.0.0.1',
+        :debug          => false
       ) }
     end
   end