stackforge/puppet-openstack
Code Issues Proposed changes

Adds Support for Debug Logging

Browse Source 
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
This commit is contained in:
Daneyon Hansen
2013-07-31 00:40:17 +00:00
parent 65a99f8de7
commit 6de4e204a1
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/cinder/storage.pp
View File

@@ -17,6 +17,7 @@ class openstack::cinder::storage(
$volume_driver = 'iscsi', $volume_driver = 'iscsi',
$iscsi_ip_address = '127.0.0.1', $iscsi_ip_address = '127.0.0.1',
$setup_test_volume = false, $setup_test_volume = false,
$debug = false,
$verbose = false $verbose = false
) { ) {
@@ -30,6 +31,7 @@ class openstack::cinder::storage(
rabbit_virtual_host => $rabbit_virtual_host, rabbit_virtual_host => $rabbit_virtual_host,
package_ensure => $package_ensure, package_ensure => $package_ensure,
api_paste_config => $api_paste_config, api_paste_config => $api_paste_config,
debug => $debug,
verbose => $verbose, verbose => $verbose,
} }

3
manifests/quantum.pp
View File

@@ -248,11 +248,13 @@ class openstack::quantum (
if $enable_dhcp_agent { if $enable_dhcp_agent {
class { 'quantum::agents::dhcp': class { 'quantum::agents::dhcp':
use_namespaces => true, use_namespaces => true,
debug => $debug,
} }
} }
if $enable_l3_agent { if $enable_l3_agent {
class { 'quantum::agents::l3': class { 'quantum::agents::l3':
use_namespaces => true, use_namespaces => true,
debug => $debug,
} }
} }
@@ -265,6 +267,7 @@ class openstack::quantum (
shared_secret => $shared_secret, shared_secret => $shared_secret,
auth_url => $auth_url, auth_url => $auth_url,
metadata_ip => $metadata_ip, metadata_ip => $metadata_ip,
debug => $debug,
} }
} }

1
spec/classes/openstack_cinder_storage_spec.rb
View File

@@ -24,6 +24,7 @@ describe 'openstack::cinder::storage' do
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:package_ensure => 'present', :package_ensure => 'present',
:api_paste_config => '/etc/cinder/api-paste.ini', :api_paste_config => '/etc/cinder/api-paste.ini',
:debug => false,
:verbose => false :verbose => false
) )
should contain_class('cinder::volume').with( should contain_class('cinder::volume').with(

10
spec/classes/openstack_quantum_spec.rb
View File

@@ -34,7 +34,6 @@ describe 'openstack::quantum' do
:rabbit_virtual_host => '/', :rabbit_virtual_host => '/',
:rabbit_user => 'rabbit_user', :rabbit_user => 'rabbit_user',
:rabbit_password => 'rabbit_pass', :rabbit_password => 'rabbit_pass',
:debug => false,
:verbose => false, :verbose => false,
:debug => false :debug => false
) )
@@ -94,7 +93,8 @@ describe 'openstack::quantum' do
params.merge!(:enable_dhcp_agent => true) params.merge!(:enable_dhcp_agent => true)
end end
it { should contain_class('quantum::agents::dhcp').with( it { should contain_class('quantum::agents::dhcp').with(
:use_namespaces => true :use_namespaces => true,
:debug => false
) } ) }
end end
@@ -103,7 +103,8 @@ describe 'openstack::quantum' do
params.merge!(:enable_l3_agent => true) params.merge!(:enable_l3_agent => true)
end end
it { should contain_class('quantum::agents::l3').with( it { should contain_class('quantum::agents::l3').with(
:use_namespaces => true :use_namespaces => true,
:debug => false
) } ) }
end end
@@ -128,7 +129,8 @@ describe 'openstack::quantum' do
:auth_password => 'q_user_pass', :auth_password => 'q_user_pass',
:shared_secret => 'foo', :shared_secret => 'foo',
:auth_url => 'http://localhost:35357/v2.0', :auth_url => 'http://localhost:35357/v2.0',
:metadata_ip => '127.0.0.1' :metadata_ip => '127.0.0.1',
:debug => false
) } ) }
end end
end end