From 3cefe2e529c51c855fbd7a18ad0008f43825b25c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 22 May 2014 23:54:18 +0200 Subject: [PATCH] cinder/rbd: configure volume_tmp_dir to /tmp Set default temporary volume directory in rbd driver to /tmp, otherwise we can hit some bugs in Cinder where it would be not possible to copy a volume to an image. https://bugs.launchpad.net/cinder/+bug/1288240 Signed-off-by: Emilien Macchi --- manifests/volume/backend/rbd.pp | 2 +- spec/classes/cloud_volume_storage_spec.rb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/manifests/volume/backend/rbd.pp b/manifests/volume/backend/rbd.pp index 65ac4e04..6a5c6a71 100644 --- a/manifests/volume/backend/rbd.pp +++ b/manifests/volume/backend/rbd.pp @@ -58,7 +58,6 @@ define cloud::volume::backend::rbd ( $rbd_ceph_conf = '/etc/ceph/ceph.conf', $rbd_flatten_volume_from_snapshot = false, $rbd_secret_uuid = false, - $volume_tmp_dir = false, $rbd_max_clone_depth = '5', ) { @@ -69,6 +68,7 @@ define cloud::volume::backend::rbd ( rbd_ceph_conf => $rbd_ceph_conf, rbd_flatten_volume_from_snapshot => $rbd_flatten_volume_from_snapshot, rbd_max_clone_depth => $rbd_max_clone_depth, + volume_tmp_dir => '/tmp' } # Configure Ceph keyring diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 9439ada6..28f94c72 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -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_user').with_value('cinder') 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( :set_key => 'volume_backend_name', :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_user').with_value('cinder') 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( :set_key => 'volume_backend_name', :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_user').with_value('cinder') 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( :set_key => 'volume_backend_name', :set_value => 'normal',