stackforge/puppet-openstack-cloud
Code Issues Proposed changes

volume/controller: disable cinder-backup

Browse Source 
Disabled for now, need more work: http://git.io/kfTmcA

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-01-27 09:37:37 +01:00
parent e521bdbd65
commit 79c376fde3
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/volume/controller.pp
View File

@ -22,8 +22,9 @@ class cloud::volume::controller(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$api_eth = $os_params::api_eth,
$backup_ceph_pool = 'ceph_backup_cinder',
$backup_ceph_user = 'cinder'
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#$backup_ceph_pool = 'ceph_backup_cinder',
#$backup_ceph_user = 'cinder'
) {
include 'cloud::volume'
@ -38,10 +39,11 @@ class cloud::volume::controller(
class { 'cinder::backup': }
class { 'cinder::backup::ceph':
backup_ceph_user => $backup_ceph_user,
backup_ceph_pool => $backup_ceph_pool
}
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#class { 'cinder::backup::ceph':
# backup_ceph_user => $backup_ceph_user,
# backup_ceph_pool => $backup_ceph_pool
#}
class { 'cinder::glance':
glance_api_servers => $ks_glance_internal_host,

20
spec/classes/cloud_volume_controller_spec.rb
View File

@ -40,8 +40,9 @@ describe 'cloud::volume::controller' do
:ks_cinder_internal_port => '8776',
:ks_keystone_internal_host => '10.0.0.1',
:ks_glance_internal_host => '10.0.0.1',
:backup_ceph_user => 'cinder',
:backup_ceph_pool => 'ceph_backup_cinder',
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#:backup_ceph_user => 'cinder',
#:backup_ceph_pool => 'ceph_backup_cinder',
:api_eth => '10.0.0.1' }
end
@ -80,13 +81,14 @@ describe 'cloud::volume::controller' do
)
end
it 'configure cinder backup using ceph backend' do
should contain_class('cinder::backup')
should contain_class('cinder::backup::ceph').with(
:backup_ceph_user => 'cinder',
:backup_ceph_pool => 'ceph_backup_cinder'
)
end
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
#it 'configure cinder backup using ceph backend' do
# should contain_class('cinder::backup')
# should contain_class('cinder::backup::ceph').with(
# :backup_ceph_user => 'cinder',
# :backup_ceph_pool => 'ceph_backup_cinder'
# )
#end
end