openstack/puppet-cinder
Code Issues Proposed changes

Merge "correct package name for cinder backup"

Browse Source
This commit is contained in:
Jenkins 2014-10-17 02:11:30 +00:00 committed by Gerrit Code Review
commit c93baffe7b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/backup/ceph.pp
View File

@ -21,6 +21,10 @@
# #
# === Parameters # === Parameters
# #
# [*backup_driver*]
# (optional) Which cinder backup driver to use
# Defaults to 'cinder.backup.drivers.ceph'
#
# [*backup_ceph_conf*] # [*backup_ceph_conf*]
# (optional) Ceph config file to use. # (optional) Ceph config file to use.
# Should be a valid ceph configuration file # Should be a valid ceph configuration file
@ -54,7 +58,7 @@
# #
class cinder::backup::ceph ( class cinder::backup::ceph (
$backup_driver = 'cinder.backup.driver.ceph', $backup_driver = 'cinder.backup.drivers.ceph',
$backup_ceph_conf = '/etc/ceph/ceph.conf', $backup_ceph_conf = '/etc/ceph/ceph.conf',
$backup_ceph_user = 'cinder', $backup_ceph_user = 'cinder',
$backup_ceph_chunk_size = '134217728', $backup_ceph_chunk_size = '134217728',

2
spec/classes/cinder_backup_ceph_spec.rb
View File

@ -41,7 +41,7 @@ describe 'cinder::backup::ceph' do
end end
it 'configures cinder.conf' do it 'configures cinder.conf' do
should contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.driver.ceph') should contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.ceph')
should contain_cinder_config('DEFAULT/backup_ceph_conf').with_value(p[:backup_ceph_conf]) should contain_cinder_config('DEFAULT/backup_ceph_conf').with_value(p[:backup_ceph_conf])
should contain_cinder_config('DEFAULT/backup_ceph_user').with_value(p[:backup_ceph_user]) should contain_cinder_config('DEFAULT/backup_ceph_user').with_value(p[:backup_ceph_user])
should contain_cinder_config('DEFAULT/backup_ceph_chunk_size').with_value(p[:backup_ceph_chunk_size]) should contain_cinder_config('DEFAULT/backup_ceph_chunk_size').with_value(p[:backup_ceph_chunk_size])