openstack/puppet-cinder
Code Issues Proposed changes

Add support for [DEFAULT] backup_ceph_max_snapshots

Browse Source 
Add support for the option to limit number of snapshots kept, which
was added to cinder during this cycle.

Depends-on: https://review.opendev.org/810457
Change-Id: Ib2b556218c5c3b2e1a521d5e733fc3a8d36daea6
This commit is contained in:
Takashi Kajinami 2025-02-05 23:58:25 +09:00
parent c898b273d8
commit da15f343ac
3 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/backup/ceph.pp
View File

@ -56,26 +56,32 @@
# Should be a valid integer
# Defaults to $facts['os_service_default']
#
# [*backup_ceph_max_snapshots*]
# (Optional) Number of the most recent snapshots to keep.
# Defaults to $facts['os_service_default']
#
class cinder::backup::ceph (
$backup_driver = 'cinder.backup.drivers.ceph.CephBackupDriver',
$backup_ceph_conf = $facts['os_service_default'],
$backup_ceph_user = $facts['os_service_default'],
$backup_ceph_chunk_size = $facts['os_service_default'],
$backup_ceph_pool = $facts['os_service_default'],
$backup_ceph_stripe_unit = $facts['os_service_default'],
$backup_ceph_stripe_count = $facts['os_service_default'],
$backup_driver = 'cinder.backup.drivers.ceph.CephBackupDriver',
$backup_ceph_conf = $facts['os_service_default'],
$backup_ceph_user = $facts['os_service_default'],
$backup_ceph_chunk_size = $facts['os_service_default'],
$backup_ceph_pool = $facts['os_service_default'],
$backup_ceph_stripe_unit = $facts['os_service_default'],
$backup_ceph_stripe_count = $facts['os_service_default'],
$backup_ceph_max_snapshots = $facts['os_service_default'],
) {
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;
'DEFAULT/backup_ceph_conf': value => $backup_ceph_conf;
'DEFAULT/backup_ceph_user': value => $backup_ceph_user;
'DEFAULT/backup_ceph_chunk_size': value => $backup_ceph_chunk_size;
'DEFAULT/backup_ceph_pool': value => $backup_ceph_pool;
'DEFAULT/backup_ceph_stripe_unit': value => $backup_ceph_stripe_unit;
'DEFAULT/backup_ceph_stripe_count': value => $backup_ceph_stripe_count;
'DEFAULT/backup_driver': value => $backup_driver;
'DEFAULT/backup_ceph_conf': value => $backup_ceph_conf;
'DEFAULT/backup_ceph_user': value => $backup_ceph_user;
'DEFAULT/backup_ceph_chunk_size': value => $backup_ceph_chunk_size;
'DEFAULT/backup_ceph_pool': value => $backup_ceph_pool;
'DEFAULT/backup_ceph_stripe_unit': value => $backup_ceph_stripe_unit;
'DEFAULT/backup_ceph_stripe_count': value => $backup_ceph_stripe_count;
'DEFAULT/backup_ceph_max_snapshots': value => $backup_ceph_max_snapshots;
}
}

5
releasenotes/notes/backup_ceph_max_snapshots-88d2ec3d64971ce8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The new ``cinder::backup::backup_ceph_max_snapshots`` parameter has been
added.

15
spec/classes/cinder_backup_ceph_spec.rb
View File

@ -33,17 +33,19 @@ describe 'cinder::backup::ceph' do
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_pool').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_stripe_unit').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_stripe_count').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_max_snapshots').with_value('<SERVICE DEFAULT>')
end
context 'when overriding default parameters' do
before do
params.merge!(
:backup_ceph_conf => '/tmp/ceph.conf',
:backup_ceph_user => 'toto',
:backup_ceph_chunk_size => '123',
:backup_ceph_pool => 'foo',
:backup_ceph_stripe_unit => '56',
:backup_ceph_stripe_count => '67'
:backup_ceph_conf => '/tmp/ceph.conf',
:backup_ceph_user => 'toto',
:backup_ceph_chunk_size => 134217728,
:backup_ceph_pool => 'foo',
:backup_ceph_stripe_unit => 256,
:backup_ceph_stripe_count => 128,
:backup_ceph_max_snapshots => 10,
)
end
@ -54,6 +56,7 @@ describe 'cinder::backup::ceph' do
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_pool').with_value(params[:backup_ceph_pool])
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_stripe_unit').with_value(params[:backup_ceph_stripe_unit])
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_stripe_count').with_value(params[:backup_ceph_stripe_count])
is_expected.to contain_cinder_config('DEFAULT/backup_ceph_max_snapshots').with_value(params[:backup_ceph_max_snapshots])
end
end
end