stackforge/puppet-openstack
Code Issues Proposed changes

Make cinder-volume optional

Browse Source 
Change-Id: I8d8b1a751096a29bd34c7a6a57a2bd268a984507
This commit is contained in:
Soren Hansen
2013-06-11 16:15:42 +02:00
parent 66cb1fe79a
commit 65136eca46
2 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/cinder/all.pp
View File

@@ -29,6 +29,7 @@ class openstack::cinder::all(
$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,
$manage_volumes = true,
$verbose = false $verbose = false
) { ) {
@@ -73,24 +74,26 @@ class openstack::cinder::all(
enabled => $enabled, enabled => $enabled,
} }
class {'::cinder::volume': if $manage_volumes {
package_ensure => $package_ensure, class {'::cinder::volume':
enabled => $enabled, package_ensure => $package_ensure,
} enabled => $enabled,
}
if $volume_driver { if $volume_driver {
if $volume_driver == 'iscsi' { if $volume_driver == 'iscsi' {
class { 'cinder::volume::iscsi': class { 'cinder::volume::iscsi':
iscsi_ip_address => $iscsi_ip_address, iscsi_ip_address => $iscsi_ip_address,
volume_group => $volume_group, volume_group => $volume_group,
}
if $setup_test_volume {
class {'::cinder::setup_test_volume':
volume_name => $volume_group,
} }
if $setup_test_volume {
class {'::cinder::setup_test_volume':
volume_name => $volume_group,
}
}
} else {
warning("Unsupported volume driver: ${volume_driver}, make sure you are configuring this yourself")
} }
} else {
warning("Unsupported volume driver: ${volume_driver}, make sure you are configuring this yourself")
} }
} }
} }

9
spec/classes/openstack_cinder_all_spec.rb
View File

@@ -56,6 +56,15 @@ describe 'openstack::cinder::all' do
should_not contain_class('cinder::setup_test_volume') should_not contain_class('cinder::setup_test_volume')
end end
describe 'with manage_volumes set to false' do
before do
params.merge!(
:manage_volumes => false
)
end
it { should_not contain_class('cinder::volume') }
end
describe 'with a volume driver other than iscsi' do describe 'with a volume driver other than iscsi' do
before do before do
params.merge!( params.merge!(