stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #478 from enovance/volume_tmp_dir

Browse Source 
cinder/rbd: configure volume_tmp_dir to /tmp
This commit is contained in:
lebauce
2014-05-26 14:08:31 +02:00
parent f06173584a 3cefe2e529
commit a57f1638b1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/volume/backend/rbd.pp
View File

@@ -58,7 +58,6 @@ define cloud::volume::backend::rbd (
$rbd_ceph_conf = '/etc/ceph/ceph.conf', $rbd_ceph_conf = '/etc/ceph/ceph.conf',
$rbd_flatten_volume_from_snapshot = false, $rbd_flatten_volume_from_snapshot = false,
$rbd_secret_uuid = false, $rbd_secret_uuid = false,
$volume_tmp_dir = false,
$rbd_max_clone_depth = '5', $rbd_max_clone_depth = '5',
) { ) {
@@ -69,6 +68,7 @@ define cloud::volume::backend::rbd (
rbd_ceph_conf => $rbd_ceph_conf, rbd_ceph_conf => $rbd_ceph_conf,
rbd_flatten_volume_from_snapshot => $rbd_flatten_volume_from_snapshot, rbd_flatten_volume_from_snapshot => $rbd_flatten_volume_from_snapshot,
rbd_max_clone_depth => $rbd_max_clone_depth, rbd_max_clone_depth => $rbd_max_clone_depth,
volume_tmp_dir => '/tmp'
} }
# Configure Ceph keyring # Configure Ceph keyring

3
spec/classes/cloud_volume_storage_spec.rb
View File

@@ -100,6 +100,7 @@ describe 'cloud::volume::storage' do
should contain_cinder_config('lowcost/rbd_pool').with_value('ceph_cinder') should contain_cinder_config('lowcost/rbd_pool').with_value('ceph_cinder')
should contain_cinder_config('lowcost/rbd_user').with_value('cinder') should contain_cinder_config('lowcost/rbd_user').with_value('cinder')
should contain_cinder_config('lowcost/rbd_secret_uuid').with_value('secret') should contain_cinder_config('lowcost/rbd_secret_uuid').with_value('secret')
should contain_cinder_config('lowcost/volume_tmp_dir').with_value('/tmp')
should contain_cinder__type('lowcost').with( should contain_cinder__type('lowcost').with(
:set_key => 'volume_backend_name', :set_key => 'volume_backend_name',
:set_value => 'lowcost', :set_value => 'lowcost',
@@ -156,6 +157,7 @@ describe 'cloud::volume::storage' do
should contain_cinder_config('lowcost/rbd_pool').with_value('low') should contain_cinder_config('lowcost/rbd_pool').with_value('low')
should contain_cinder_config('lowcost/rbd_user').with_value('cinder') should contain_cinder_config('lowcost/rbd_user').with_value('cinder')
should contain_cinder_config('lowcost/rbd_secret_uuid').with_value('secret') should contain_cinder_config('lowcost/rbd_secret_uuid').with_value('secret')
should contain_cinder_config('lowcost/volume_tmp_dir').with_value('/tmp')
should contain_cinder__type('lowcost').with( should contain_cinder__type('lowcost').with(
:set_key => 'volume_backend_name', :set_key => 'volume_backend_name',
:set_value => 'lowcost', :set_value => 'lowcost',
@@ -168,6 +170,7 @@ describe 'cloud::volume::storage' do
should contain_cinder_config('normal/rbd_pool').with_value('normal') should contain_cinder_config('normal/rbd_pool').with_value('normal')
should contain_cinder_config('normal/rbd_user').with_value('cinder') should contain_cinder_config('normal/rbd_user').with_value('cinder')
should contain_cinder_config('normal/rbd_secret_uuid').with_value('secret') should contain_cinder_config('normal/rbd_secret_uuid').with_value('secret')
should contain_cinder_config('normal/volume_tmp_dir').with_value('/tmp')
should contain_cinder__type('normal').with( should contain_cinder__type('normal').with(
:set_key => 'volume_backend_name', :set_key => 'volume_backend_name',
:set_value => 'normal', :set_value => 'normal',