openstack/puppet-cinder
Code Issues Proposed changes

Merge "Add support for [DEFAULT] backup_swift_block_size"

Browse Source
This commit is contained in:
Zuul
2025-09-15 20:16:57 +00:00
committed by Gerrit Code Review
parent 20710186ba f762a5f4e2
commit 6bb1006728
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/backup/swift.pp
View File

@@ -33,6 +33,11 @@
# (optional) The size in bytes of Swift backup objects. # (optional) The size in bytes of Swift backup objects.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*backup_swift_block_size*]
# (optional) The size in bytes that changes are tracked for incremental
# backups.
# Defaults to $facts['os_service_default']
#
# [*backup_swift_retry_attempts*] # [*backup_swift_retry_attempts*]
# (optional) The number of retries to make for Swift operations. # (optional) The number of retries to make for Swift operations.
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
@@ -94,6 +99,7 @@ class cinder::backup::swift (
$backup_swift_container = 'volumebackups', $backup_swift_container = 'volumebackups',
$backup_swift_create_storage_policy = $facts['os_service_default'], $backup_swift_create_storage_policy = $facts['os_service_default'],
$backup_swift_object_size = $facts['os_service_default'], $backup_swift_object_size = $facts['os_service_default'],
$backup_swift_block_size = $facts['os_service_default'],
$backup_swift_retry_attempts = $facts['os_service_default'], $backup_swift_retry_attempts = $facts['os_service_default'],
$backup_swift_retry_backoff = $facts['os_service_default'], $backup_swift_retry_backoff = $facts['os_service_default'],
$backup_swift_user_domain = $facts['os_service_default'], $backup_swift_user_domain = $facts['os_service_default'],
@@ -112,6 +118,7 @@ class cinder::backup::swift (
'DEFAULT/backup_swift_container': value => $backup_swift_container; 'DEFAULT/backup_swift_container': value => $backup_swift_container;
'DEFAULT/backup_swift_create_storage_policy': value => $backup_swift_create_storage_policy; 'DEFAULT/backup_swift_create_storage_policy': value => $backup_swift_create_storage_policy;
'DEFAULT/backup_swift_object_size': value => $backup_swift_object_size; 'DEFAULT/backup_swift_object_size': value => $backup_swift_object_size;
'DEFAULT/backup_swift_block_size': value => $backup_swift_block_size;
'DEFAULT/backup_swift_retry_attempts': value => $backup_swift_retry_attempts; 'DEFAULT/backup_swift_retry_attempts': value => $backup_swift_retry_attempts;
'DEFAULT/backup_swift_retry_backoff': value => $backup_swift_retry_backoff; 'DEFAULT/backup_swift_retry_backoff': value => $backup_swift_retry_backoff;
'DEFAULT/backup_swift_user_domain': value => $backup_swift_user_domain; 'DEFAULT/backup_swift_user_domain': value => $backup_swift_user_domain;

5
releasenotes/notes/backup_swift_block_size-f00288a2c0d5ec3f.yaml Normal file
View File

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

26
spec/classes/cinder_backup_swift_spec.rb
View File

@@ -29,6 +29,7 @@ describe 'cinder::backup::swift' do
:backup_swift_container => 'volumebackups', :backup_swift_container => 'volumebackups',
:backup_swift_create_storage_policy => '<SERVICE DEFAULT>', :backup_swift_create_storage_policy => '<SERVICE DEFAULT>',
:backup_swift_object_size => '<SERVICE DEFAULT>', :backup_swift_object_size => '<SERVICE DEFAULT>',
:backup_swift_block_size => '<SERVICE DEFAULT>',
:backup_swift_retry_attempts => '<SERVICE DEFAULT>', :backup_swift_retry_attempts => '<SERVICE DEFAULT>',
:backup_swift_retry_backoff => '<SERVICE DEFAULT>', :backup_swift_retry_backoff => '<SERVICE DEFAULT>',
:backup_swift_user_domain => '<SERVICE DEFAULT>', :backup_swift_user_domain => '<SERVICE DEFAULT>',
@@ -56,6 +57,7 @@ describe 'cinder::backup::swift' do
is_expected.to contain_cinder_config('DEFAULT/backup_swift_container').with_value(p[:backup_swift_container]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_container').with_value(p[:backup_swift_container])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_create_storage_policy').with_value(p[:backup_swift_create_storage_policy]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_create_storage_policy').with_value(p[:backup_swift_create_storage_policy])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_object_size').with_value(p[:backup_swift_object_size]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_object_size').with_value(p[:backup_swift_object_size])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_block_size').with_value(p[:backup_swift_block_size])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_attempts').with_value(p[:backup_swift_retry_attempts]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_attempts').with_value(p[:backup_swift_retry_attempts])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_backoff').with_value(p[:backup_swift_retry_backoff]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_backoff').with_value(p[:backup_swift_retry_backoff])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_user_domain').with_value(p[:backup_swift_user_domain]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_user_domain').with_value(p[:backup_swift_user_domain])
@@ -67,16 +69,19 @@ describe 'cinder::backup::swift' do
context 'when overriding default parameters' do context 'when overriding default parameters' do
before :each do before :each do
params.merge!(:backup_swift_url => 'https://controller2:8080/v1/AUTH_') params.merge!({
params.merge!(:backup_swift_auth_url => 'https://controller2:5000') :backup_swift_url => 'https://controller2:8080/v1/AUTH_',
params.merge!(:swift_catalog_info => 'object-store:swift:internalURL') :backup_swift_auth_url => 'https://controller2:5000',
params.merge!(:backup_swift_container => 'toto') :swift_catalog_info => 'object-store:swift:internalURL',
params.merge!(:backup_swift_create_storage_policy => 'foo') :backup_swift_container => 'toto',
params.merge!(:backup_swift_object_size => '123') :backup_swift_create_storage_policy => 'foo',
params.merge!(:backup_swift_retry_attempts => '99') :backup_swift_object_size => 52428800,
params.merge!(:backup_swift_retry_backoff => '56') :backup_swift_block_size => 32768,
params.merge!(:backup_compression_algorithm => 'None') :backup_swift_retry_attempts => 3,
params.merge!(:backup_swift_service_auth => true) :backup_swift_retry_backoff => 2,
:backup_compression_algorithm => 'none',
:backup_swift_service_auth => true,
})
end end
it 'should replace default parameters with new values' do it 'should replace default parameters with new values' do
is_expected.to contain_cinder_config('DEFAULT/backup_swift_url').with_value(p[:backup_swift_url]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_url').with_value(p[:backup_swift_url])
@@ -85,6 +90,7 @@ describe 'cinder::backup::swift' do
is_expected.to contain_cinder_config('DEFAULT/backup_swift_container').with_value(p[:backup_swift_container]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_container').with_value(p[:backup_swift_container])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_create_storage_policy').with_value(p[:backup_swift_create_storage_policy]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_create_storage_policy').with_value(p[:backup_swift_create_storage_policy])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_object_size').with_value(p[:backup_swift_object_size]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_object_size').with_value(p[:backup_swift_object_size])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_block_size').with_value(p[:backup_swift_block_size])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_attempts').with_value(p[:backup_swift_retry_attempts]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_attempts').with_value(p[:backup_swift_retry_attempts])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_backoff').with_value(p[:backup_swift_retry_backoff]) is_expected.to contain_cinder_config('DEFAULT/backup_swift_retry_backoff').with_value(p[:backup_swift_retry_backoff])
is_expected.to contain_cinder_config('DEFAULT/backup_compression_algorithm').with_value(p[:backup_compression_algorithm]) is_expected.to contain_cinder_config('DEFAULT/backup_compression_algorithm').with_value(p[:backup_compression_algorithm])