stackforge/puppet-openstack-cloud
Code Issues Proposed changes

volume/storage: change default values according to rbd manifests

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-10 11:28:47 +01:00
parent 9bb1be02a9
commit 11de6a7932
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/volume/storage.pp
View File

@ -17,9 +17,9 @@
#
class privatecloud::volume::storage(
$cinder_rbd_pool = $os_params::cinder_rbd_pool,
$glance_api_version = $os_params::glance_api_version,
$cinder_rbd_user = $os_params::cinder_rbd_user,
$cinder_rbd_pool = 'ceph_cinder',
$cinder_rbd_user = 'cinder',
$cinder_rbd_secret_uuid = $os_params::cinder_rbd_secret_uuid,
) {

8
spec/classes/privatecloud_volume_storage_spec.rb
View File

@ -36,8 +36,8 @@ describe 'privatecloud::volume::storage' do
end
let :params do
{ :cinder_rbd_pool => 'cinder',
:cinder_rbd_user => 'ceph-cinder',
{ :cinder_rbd_pool => 'ceph_cinder',
:cinder_rbd_user => 'cinder',
:cinder_rbd_secret_uuid => 'secrete',
:glance_api_version => '2' }
end
@ -60,9 +60,9 @@ describe 'privatecloud::volume::storage' do
it 'configure cinder volume with rbd backend' do
should contain_class('cinder::volume::rbd').with(
:rbd_pool => 'cinder',
:rbd_pool => 'ceph_cinder',
:glance_api_version => '2',
:rbd_user => 'ceph-cinder',
:rbd_user => 'cinder',
:rbd_secret_uuid => 'secrete'
)
end