Merge "Added copy-on-write cloning of images to volumes."

This commit is contained in:
Jenkins 2014-03-27 14:02:52 +00:00 committed by Gerrit Code Review
commit dfa1102219
2 changed files with 8 additions and 2 deletions

View File

@ -9,12 +9,15 @@
# $rbd_store_ceph_conf - Optional. Default:'/etc/ceph/ceph.conf'
#
# $rbd_store_chunk_size - Optional. Default:'8'
#
# $show_image_direct_url - Optional. Enables direct COW from glance to rbd
class glance::backend::rbd(
$rbd_store_user = undef,
$rbd_store_ceph_conf = '/etc/ceph/ceph.conf',
$rbd_store_pool = 'images',
$rbd_store_chunk_size = '8',
$show_image_direct_url = undef,
) {
include glance::params
@ -24,6 +27,7 @@ class glance::backend::rbd(
'DEFAULT/rbd_store_user': value => $rbd_store_user;
'DEFAULT/rbd_store_pool': value => $rbd_store_pool;
'DEFAULT/rbd_store_chunk_size': value => $rbd_store_chunk_size;
'DEFAULT/show_image_direct_url': value => $show_image_direct_url;
}
package { 'python-ceph':

View File

@ -27,11 +27,13 @@ describe 'glance::backend::rbd' do
describe 'when passing params' do
let :params do
{
:rbd_store_user => 'user',
:rbd_store_chunk_size => '2',
:rbd_store_user => 'user',
:rbd_store_chunk_size => '2',
:show_image_direct_url => 'true',
}
it { should contain_glance_api_config('DEFAULT/rbd_store_user').with_value('user') }
it { should contain_glance_api_config('DEFAULT/rbd_store_chunk_size').with_value('2') }
it { should contain_glance_api_config('DEFAULT/how_image_direct_url').with_value('true') }
end
end
end