stackforge/puppet-openstack-cloud
Code Issues Proposed changes

image: change driver from swift to ceph

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-01-10 11:58:50 +01:00
parent 7f87e86a33
commit bde476d757
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/image.pp
View File

@@ -66,6 +66,8 @@ class privatecloud::image(
$rabbit_password = $os_params::rabbit_password, $rabbit_password = $os_params::rabbit_password,
$rabbit_host = $os_params::rabbit_hosts[0], $rabbit_host = $os_params::rabbit_hosts[0],
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
$rbd_store_pool = 'ceph_glance',
$rbd_store_user = 'glance',
$verbose = $os_params::verbose, $verbose = $os_params::verbose,
$debug = $os_params::debug $debug = $os_params::debug
) { ) {
@@ -93,10 +95,9 @@ class privatecloud::image(
} }
# TODO(EmilienM) We should migrate the backend to Ceph (WIP). For now, I let Swift. # TODO(EmilienM) We should migrate the backend to Ceph (WIP). For now, I let Swift.
class { 'glance::backend::swift': class { 'glance::backend::rbd':
swift_store_user => 'services:glance', rbd_store_user => $rbd_store_user,
swift_store_key => $ks_glance_password, rbd_store_pool => $rbd_store_pool
swift_store_auth_address => $ks_keystone_internal_host,
} }
class { 'glance::cache::cleaner': } class { 'glance::cache::cleaner': }

11
spec/classes/privatecloud_image_spec.rb
View File

@@ -31,6 +31,8 @@ describe 'privatecloud::image' do
:ks_glance_password => 'secrete', :ks_glance_password => 'secrete',
:rabbit_host => '10.0.0.1', :rabbit_host => '10.0.0.1',
:rabbit_password => 'secrete', :rabbit_password => 'secrete',
:rbd_store_user => 'glance',
:rbd_store_pool => 'ceph_glance',
:debug => true, :debug => true,
:verbose => true, :verbose => true,
:api_eth => '10.0.0.1' } :api_eth => '10.0.0.1' }
@@ -74,11 +76,10 @@ describe 'privatecloud::image' do
) )
end end
it 'configure glance swift backend' do it 'configure glance rbd backend' do
should contain_class('glance::backend::swift').with( should contain_class('glance::backend::rbd').with(
:swift_store_user => 'services:glance', :rbd_store_pool => 'ceph_glance',
:swift_store_key => 'secrete', :rbd_store_user => 'glance'
:swift_store_auth_address => '10.0.0.1',
) )
end end