From 346e51d9a92c2748afad1aeade781caf9d4bb873 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 14 Oct 2012 00:26:29 -0700
Subject: [PATCH] update log_debug,log_verbose to debug,verbose

---
 manifests/glance.pp                       |  8 +++----
 spec/classes/openstack_controller_spec.rb | 26 +++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/manifests/glance.pp b/manifests/glance.pp
index d6624e7..a7fbbc3 100644
--- a/manifests/glance.pp
+++ b/manifests/glance.pp
@@ -52,8 +52,8 @@ class openstack::glance (
 
   # Install and configure glance-api
   class { 'glance::api':
-    log_verbose       => $verbose,
-    log_debug         => $verbose,
+    verbose       => $verbose,
+    debug         => $verbose,
     auth_type         => 'keystone',
     auth_port         => '35357',
     auth_uri          => $auth_uri,
@@ -67,8 +67,8 @@ class openstack::glance (
 
   # Install and configure glance-registry
   class { 'glance::registry':
-    log_verbose       => $verbose,
-    log_debug         => $verbose,
+    verbose       => $verbose,
+    debug         => $verbose,
     auth_host         => $keystone_host,
     auth_port         => '35357',
     auth_type         => 'keystone',
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index bfa58fb..45cdaa9 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -66,8 +66,8 @@ describe 'openstack::controller' do
       should contain_class('keystone').with(
         :admin_token  => 'keystone_admin_token',
         :bind_host    => '0.0.0.0',
-        :log_verbose  => false,
-        :log_debug    => false,
+        :verbose      => false,
+        :debug        => false,
         :catalog_type => 'sql',
         :enabled      => true
       )
@@ -98,8 +98,8 @@ describe 'openstack::controller' do
         #:before           => 'Class[nova::api]'
       )
       should contain_class('glance::api').with(
-        :log_verbose       => false,
-        :log_debug         => false,
+        :verbose           => false,
+        :debug             => false,
         :auth_type         => 'keystone',
         :auth_host         => '127.0.0.1',
         :auth_port         => '35357',
@@ -111,8 +111,8 @@ describe 'openstack::controller' do
       should contain_class('glance::backend::file')
 
       should contain_class('glance::registry').with(
-        :log_verbose       => false,
-        :log_debug         => false,
+        :verbose           => false,
+        :debug             => false,
         :auth_type         => 'keystone',
         :auth_host         => '127.0.0.1',
         :auth_port         => '35357',
@@ -200,9 +200,9 @@ describe 'openstack::controller' do
 
       it 'should override keystone config' do
         should contain_class('keystone').with(
-          :log_verbose   => true,
-          :log_debug     => true,
-          :admin_token   => 'foo'
+          :verbose     => true,
+          :debug       => true,
+          :admin_token => 'foo'
         )
         should contain_class('keystone::config::mysql').with(
           :password => 'pass'
@@ -225,14 +225,14 @@ describe 'openstack::controller' do
       end
       it 'should override glance config' do
         should contain_class('glance::api').with(
-          :log_verbose       => true,
-          :log_debug         => true,
+          :verbose           => true,
+          :debug             => true,
           :keystone_password => 'pass6',
           :enabled           => true
         )
         should contain_class('glance::registry').with(
-          :log_verbose       => true,
-          :log_debug         => true,
+          :verbose           => true,
+          :debug             => true,
           :keystone_password => 'pass6',
           :sql_connection    => "mysql://glance:pass2@127.0.0.1/glance",
           :enabled           => true