openstack
/
puppet-cinder
Code Issues Proposed changes

Merge "Use boolean instead of string"

This commit is contained in:
Jenkins 2013-05-22 19:57:15 +00:00 committed by Gerrit Code Review
parent 56644f7914 be2ca74682
commit e72156313c
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/base.pp
View File

@ -13,7 +13,7 @@ class cinder::base (
$rabbit_userid = 'nova',
$package_ensure = 'present',
$api_paste_config = '/etc/cinder/api-paste.ini',
$verbose = 'False'
$verbose = false
) {
warning('The "cinder::base" class is deprecated. Use "cinder" instead.')

4
manifests/init.pp
View File

@ -27,8 +27,8 @@ class cinder (
$qpid_tcp_nodelay = true,
$package_ensure = 'present',
$api_paste_config = '/etc/cinder/api-paste.ini',
$verbose = 'False',
$debug = 'False'
$verbose = false,
$debug = false
) {
include cinder::params

2
manifests/volume/nexenta.pp
View File

@ -36,7 +36,7 @@ class cinder::volume::nexenta (
$nexenta_target_prefix = 'iqn:',
$nexenta_target_group_prefix = 'cinder/',
$nexenta_blocksize = '8k',
$nexenta_sparse = 'True'
$nexenta_sparse = true
) {
cinder_config {

12
spec/classes/cinder_spec.rb
View File

@ -32,7 +32,7 @@ describe 'cinder' do
:value => '127.0.0.1:5672'
)
should contain_cinder_config('DEFAULT/rabbit_ha_queues').with(
:value => 'false'
:value => false
)
should contain_cinder_config('DEFAULT/rabbit_virtual_host').with(
:value => '/'
@ -44,10 +44,10 @@ describe 'cinder' do
:value => 'mysql://user:password@host/database'
)
should contain_cinder_config('DEFAULT/verbose').with(
:value => 'False'
:value => false
)
should contain_cinder_config('DEFAULT/debug').with(
:value => 'False'
:value => false
)
should contain_cinder_config('DEFAULT/api_paste_config').with(
:value => '/etc/cinder/api-paste.ini'
@ -81,7 +81,7 @@ describe 'cinder' do
:value => 'rabbit1:5672,rabbit2:5672'
)
should contain_cinder_config('DEFAULT/rabbit_ha_queues').with(
:value => 'true'
:value => true
)
end
end
@ -102,7 +102,7 @@ describe 'cinder' do
it { should contain_cinder_config('DEFAULT/qpid_port').with_value('5672') }
it { should contain_cinder_config('DEFAULT/qpid_username').with_value('guest') }
it { should contain_cinder_config('DEFAULT/qpid_password').with_value('guest') }
it { should contain_cinder_config('DEFAULT/qpid_reconnect').with_value('true') }
it { should contain_cinder_config('DEFAULT/qpid_reconnect').with_value(true) }
it { should contain_cinder_config('DEFAULT/qpid_reconnect_timeout').with_value('0') }
it { should contain_cinder_config('DEFAULT/qpid_reconnect_limit').with_value('0') }
it { should contain_cinder_config('DEFAULT/qpid_reconnect_interval_min').with_value('0') }
@ -110,7 +110,7 @@ describe 'cinder' do
it { should contain_cinder_config('DEFAULT/qpid_reconnect_interval').with_value('0') }
it { should contain_cinder_config('DEFAULT/qpid_heartbeat').with_value('60') }
it { should contain_cinder_config('DEFAULT/qpid_protocol').with_value('tcp') }
it { should contain_cinder_config('DEFAULT/qpid_tcp_nodelay').with_value('true') }
it { should contain_cinder_config('DEFAULT/qpid_tcp_nodelay').with_value(true) }
end

2
spec/classes/cinder_volume_nexenta_spec.rb
View File

@ -16,7 +16,7 @@ describe 'cinder::volume::nexenta' do
:nexenta_target_prefix => 'iqn:',
:nexenta_target_group_prefix => 'cinder/',
:nexenta_blocksize => '8k',
:nexenta_sparse => 'True' }
:nexenta_sparse => true }
end
let :facts do