stackforge/puppet-openstack
Code Issues Proposed changes

update log_debug,log_verbose to debug,verbose

Browse Source
This commit is contained in:
Dan Bode
2012-10-14 00:26:29 -07:00
parent c9e1ed4f9a
commit 346e51d9a9
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/glance.pp
View File

@@ -52,8 +52,8 @@ class openstack::glance (
# Install and configure glance-api # Install and configure glance-api
class { 'glance::api': class { 'glance::api':
log_verbose => $verbose, verbose => $verbose,
log_debug => $verbose, debug => $verbose,
auth_type => 'keystone', auth_type => 'keystone',
auth_port => '35357', auth_port => '35357',
auth_uri => $auth_uri, auth_uri => $auth_uri,
@@ -67,8 +67,8 @@ class openstack::glance (
# Install and configure glance-registry # Install and configure glance-registry
class { 'glance::registry': class { 'glance::registry':
log_verbose => $verbose, verbose => $verbose,
log_debug => $verbose, debug => $verbose,
auth_host => $keystone_host, auth_host => $keystone_host,
auth_port => '35357', auth_port => '35357',
auth_type => 'keystone', auth_type => 'keystone',

26
spec/classes/openstack_controller_spec.rb
View File

@@ -66,8 +66,8 @@ describe 'openstack::controller' do
should contain_class('keystone').with( should contain_class('keystone').with(
:admin_token => 'keystone_admin_token', :admin_token => 'keystone_admin_token',
:bind_host => '0.0.0.0', :bind_host => '0.0.0.0',
:log_verbose => false, :verbose => false,
:log_debug => false, :debug => false,
:catalog_type => 'sql', :catalog_type => 'sql',
:enabled => true :enabled => true
) )
@@ -98,8 +98,8 @@ describe 'openstack::controller' do
#:before => 'Class[nova::api]' #:before => 'Class[nova::api]'
) )
should contain_class('glance::api').with( should contain_class('glance::api').with(
:log_verbose => false, :verbose => false,
:log_debug => false, :debug => false,
:auth_type => 'keystone', :auth_type => 'keystone',
:auth_host => '127.0.0.1', :auth_host => '127.0.0.1',
:auth_port => '35357', :auth_port => '35357',
@@ -111,8 +111,8 @@ describe 'openstack::controller' do
should contain_class('glance::backend::file') should contain_class('glance::backend::file')
should contain_class('glance::registry').with( should contain_class('glance::registry').with(
:log_verbose => false, :verbose => false,
:log_debug => false, :debug => false,
:auth_type => 'keystone', :auth_type => 'keystone',
:auth_host => '127.0.0.1', :auth_host => '127.0.0.1',
:auth_port => '35357', :auth_port => '35357',
@@ -200,9 +200,9 @@ describe 'openstack::controller' do
it 'should override keystone config' do it 'should override keystone config' do
should contain_class('keystone').with( should contain_class('keystone').with(
:log_verbose => true, :verbose => true,
:log_debug => true, :debug => true,
:admin_token => 'foo' :admin_token => 'foo'
) )
should contain_class('keystone::config::mysql').with( should contain_class('keystone::config::mysql').with(
:password => 'pass' :password => 'pass'
@@ -225,14 +225,14 @@ describe 'openstack::controller' do
end end
it 'should override glance config' do it 'should override glance config' do
should contain_class('glance::api').with( should contain_class('glance::api').with(
:log_verbose => true, :verbose => true,
:log_debug => true, :debug => true,
:keystone_password => 'pass6', :keystone_password => 'pass6',
:enabled => true :enabled => true
) )
should contain_class('glance::registry').with( should contain_class('glance::registry').with(
:log_verbose => true, :verbose => true,
:log_debug => true, :debug => true,
:keystone_password => 'pass6', :keystone_password => 'pass6',
:sql_connection => "mysql://glance:pass2@127.0.0.1/glance", :sql_connection => "mysql://glance:pass2@127.0.0.1/glance",
:enabled => true :enabled => true