stackforge/puppet-openstack-cloud
Code Issues Proposed changes

volume/controller: change backup driver to ceph

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

10
manifests/volume/controller.pp
View File

@ -20,11 +20,10 @@ class privatecloud::volume::controller(
$ks_cinder_internal_port = $os_params::ks_cinder_internal_port, $ks_cinder_internal_port = $os_params::ks_cinder_internal_port,
$ks_cinder_password = $os_params::ks_cinder_password, $ks_cinder_password = $os_params::ks_cinder_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_swift_internal_proto = $os_params::ks_swift_internal_proto,
$ks_swift_internal_host = $os_params::ks_swift_internal_host,
$ks_swift_internal_port = $os_params::ks_swift_internal_port,
$ks_glance_internal_host = $os_params::ks_glance_internal_host, $ks_glance_internal_host = $os_params::ks_glance_internal_host,
$api_eth = $os_params::api_eth, $api_eth = $os_params::api_eth,
$backup_ceph_pool = 'ceph_backup_cinder',
$backup_ceph_user = 'cinder'
) { ) {
include 'privatecloud::volume' include 'privatecloud::volume'
@ -39,8 +38,9 @@ class privatecloud::volume::controller(
class { 'cinder::backup': } class { 'cinder::backup': }
class { 'cinder::backup::swift': class { 'cinder::backup::ceph':
backup_swift_url => "${ks_swift_internal_proto}://${ks_swift_internal_host}:${ks_swift_internal_port}/v1/AUTH" backup_ceph_user => $backup_ceph_user,
backup_ceph_pool => $backup_ceph_pool
} }
class { 'cinder::glance': class { 'cinder::glance':

12
spec/classes/privatecloud_volume_controller_spec.rb
View File

@ -40,9 +40,8 @@ describe 'privatecloud::volume::controller' do
:ks_cinder_internal_port => '8776', :ks_cinder_internal_port => '8776',
:ks_keystone_internal_host => '10.0.0.1', :ks_keystone_internal_host => '10.0.0.1',
:ks_glance_internal_host => '10.0.0.1', :ks_glance_internal_host => '10.0.0.1',
:ks_swift_internal_port => '8080', :backup_ceph_user => 'cinder',
:ks_swift_internal_host => '10.0.0.1', :backup_ceph_pool => 'ceph_backup_cinder',
:ks_swift_internal_proto => 'http',
:api_eth => '10.0.0.1' } :api_eth => '10.0.0.1' }
end end
@ -81,10 +80,11 @@ describe 'privatecloud::volume::controller' do
) )
end end
it 'configure cinder backup using swift backend' do it 'configure cinder backup using ceph backend' do
should contain_class('cinder::backup') should contain_class('cinder::backup')
should contain_class('cinder::backup::swift').with( should contain_class('cinder::backup::ceph').with(
:backup_swift_url => 'http://10.0.0.1:8080/v1/AUTH', :backup_ceph_user => 'cinder',
:backup_ceph_pool => 'ceph_backup_cinder'
) )
end end