diff --git a/manifests/backend/vstorage.pp b/manifests/backend/vstorage.pp index 0f0ef7ab..2244ba9d 100644 --- a/manifests/backend/vstorage.pp +++ b/manifests/backend/vstorage.pp @@ -87,7 +87,11 @@ define cinder::backend::vstorage ( if $manage_volume_type { cinder_type { $volume_backend_name: ensure => present, - properties => ["volume_backend_name=${volume_backend_name}"], + properties => ['vz:volume_format=qcow2'], + } + cinder_type { "${volume_backend_name}-ploop": + ensure => present, + properties => ['vz:volume_format=ploop'], } } diff --git a/spec/defines/cinder_backend_vstorage_spec.rb b/spec/defines/cinder_backend_vstorage_spec.rb index c71d5812..77879b92 100644 --- a/spec/defines/cinder_backend_vstorage_spec.rb +++ b/spec/defines/cinder_backend_vstorage_spec.rb @@ -52,10 +52,13 @@ describe 'cinder::backend::vstorage' do before do params.merge!({:manage_volume_type => true}) end - it 'should create volume type' do + it 'should create volume types' do should contain_cinder_type('vstorage').with( :ensure => :present, - :properties => ['volume_backend_name=vstorage']) + :properties => ['vz:volume_format=qcow2']) + should contain_cinder_type('vstorage-ploop').with( + :ensure => :present, + :properties => ['vz:volume_format=ploop']) end end