openstack
/
puppet-cinder
Code Issues Proposed changes

Add backup_swift_create_storage_policy to cinder::backup::swift 

Adds the backup_swift_create_storage_policy config option
that was introduced in [1].

[1] https://review.opendev.org/c/openstack/cinder/+/761113

Change-Id: I26398350ab24b60603563b025319165dcd02c669
This commit is contained in:
Tobias Urdin 2021-06-29 14:16:27 +02:00
parent d9ccac4f21
commit 5e86972b77
3 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
manifests/backup/swift.pp
View File

@ -25,6 +25,10 @@
# (optional) The default Swift container to use.
# Defaults to 'volumebackups'
#
# [*backup_swift_create_storage_policy*]
# (optional) The storage policy to use when creating the Swift container.
# Defaults to $::os_service_default
#
# [*backup_swift_object_size*]
# (optional) The size in bytes of Swift backup objects.
# Defaults to $::os_service_default
@ -79,35 +83,37 @@
#
#
class cinder::backup::swift (
$backup_driver = 'cinder.backup.drivers.swift.SwiftBackupDriver',
$backup_swift_url = $::os_service_default,
$backup_swift_auth_url = $::os_service_default,
$swift_catalog_info = $::os_service_default,
$backup_swift_container = 'volumebackups',
$backup_swift_object_size = $::os_service_default,
$backup_swift_retry_attempts = $::os_service_default,
$backup_swift_retry_backoff = $::os_service_default,
$backup_swift_user_domain = $::os_service_default,
$backup_swift_project_domain = $::os_service_default,
$backup_swift_project = $::os_service_default,
$backup_compression_algorithm = $::os_service_default,
$backup_driver = 'cinder.backup.drivers.swift.SwiftBackupDriver',
$backup_swift_url = $::os_service_default,
$backup_swift_auth_url = $::os_service_default,
$swift_catalog_info = $::os_service_default,
$backup_swift_container = 'volumebackups',
$backup_swift_create_storage_policy = $::os_service_default,
$backup_swift_object_size = $::os_service_default,
$backup_swift_retry_attempts = $::os_service_default,
$backup_swift_retry_backoff = $::os_service_default,
$backup_swift_user_domain = $::os_service_default,
$backup_swift_project_domain = $::os_service_default,
$backup_swift_project = $::os_service_default,
$backup_compression_algorithm = $::os_service_default,
) {
include cinder::deps
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;
'DEFAULT/backup_swift_url': value => $backup_swift_url;
'DEFAULT/backup_swift_auth_url': value => $backup_swift_auth_url;
'DEFAULT/swift_catalog_info': value => $swift_catalog_info;
'DEFAULT/backup_swift_container': value => $backup_swift_container;
'DEFAULT/backup_swift_object_size': value => $backup_swift_object_size;
'DEFAULT/backup_swift_retry_attempts': value => $backup_swift_retry_attempts;
'DEFAULT/backup_swift_retry_backoff': value => $backup_swift_retry_backoff;
'DEFAULT/backup_swift_user_domain': value => $backup_swift_user_domain;
'DEFAULT/backup_swift_project_domain': value => $backup_swift_project_domain;
'DEFAULT/backup_swift_project': value => $backup_swift_project;
'DEFAULT/backup_compression_algorithm': value => $backup_compression_algorithm;
'DEFAULT/backup_driver': value => $backup_driver;
'DEFAULT/backup_swift_url': value => $backup_swift_url;
'DEFAULT/backup_swift_auth_url': value => $backup_swift_auth_url;
'DEFAULT/swift_catalog_info': value => $swift_catalog_info;
'DEFAULT/backup_swift_container': value => $backup_swift_container;
'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_retry_attempts': value => $backup_swift_retry_attempts;
'DEFAULT/backup_swift_retry_backoff': value => $backup_swift_retry_backoff;
'DEFAULT/backup_swift_user_domain': value => $backup_swift_user_domain;
'DEFAULT/backup_swift_project_domain': value => $backup_swift_project_domain;
'DEFAULT/backup_swift_project': value => $backup_swift_project;
'DEFAULT/backup_compression_algorithm': value => $backup_compression_algorithm;
}
}

5
releasenotes/notes/add-cinder-backup-swift-backup_swift_create_storage_policy-ae811a83c2b469ea.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Added parameter backup_swift_create_storage_policy to cinder::backup::swift
class.

26
spec/classes/cinder_backup_swift_spec.rb
View File

@ -23,17 +23,18 @@ require 'spec_helper'
describe 'cinder::backup::swift' do
let :default_params do
{
:backup_swift_url => '<SERVICE DEFAULT>',
:backup_swift_auth_url => '<SERVICE DEFAULT>',
:swift_catalog_info => '<SERVICE DEFAULT>',
:backup_swift_container => 'volumebackups',
:backup_swift_object_size => '<SERVICE DEFAULT>',
:backup_swift_retry_attempts => '<SERVICE DEFAULT>',
:backup_swift_retry_backoff => '<SERVICE DEFAULT>',
:backup_swift_user_domain => '<SERVICE DEFAULT>',
:backup_swift_project_domain => '<SERVICE DEFAULT>',
:backup_swift_project => '<SERVICE DEFAULT>',
:backup_compression_algorithm => '<SERVICE DEFAULT>'
:backup_swift_url => '<SERVICE DEFAULT>',
:backup_swift_auth_url => '<SERVICE DEFAULT>',
:swift_catalog_info => '<SERVICE DEFAULT>',
:backup_swift_container => 'volumebackups',
:backup_swift_create_storage_policy => '<SERVICE DEFAULT>',
:backup_swift_object_size => '<SERVICE DEFAULT>',
:backup_swift_retry_attempts => '<SERVICE DEFAULT>',
:backup_swift_retry_backoff => '<SERVICE DEFAULT>',
:backup_swift_user_domain => '<SERVICE DEFAULT>',
:backup_swift_project_domain => '<SERVICE DEFAULT>',
:backup_swift_project => '<SERVICE DEFAULT>',
:backup_compression_algorithm => '<SERVICE DEFAULT>'
}
end
@ -52,6 +53,7 @@ describe 'cinder::backup::swift' do
is_expected.to contain_cinder_config('DEFAULT/backup_swift_auth_url').with_value(p[:backup_swift_auth_url])
is_expected.to contain_cinder_config('DEFAULT/swift_catalog_info').with_value(p[:swift_catalog_info])
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_object_size').with_value(p[:backup_swift_object_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_backoff').with_value(p[:backup_swift_retry_backoff])
@ -67,6 +69,7 @@ describe 'cinder::backup::swift' do
params.merge!(:backup_swift_auth_url => 'https://controller2:5000')
params.merge!(:swift_catalog_info => 'object-store:swift:internalURL')
params.merge!(:backup_swift_container => 'toto')
params.merge!(:backup_swift_create_storage_policy => 'foo')
params.merge!(:backup_swift_object_size => '123')
params.merge!(:backup_swift_retry_attempts => '99')
params.merge!(:backup_swift_retry_backoff => '56')
@ -77,6 +80,7 @@ describe 'cinder::backup::swift' do
is_expected.to contain_cinder_config('DEFAULT/backup_swift_auth_url').with_value(p[:backup_swift_auth_url])
is_expected.to contain_cinder_config('DEFAULT/swift_catalog_info').with_value(p[:swift_catalog_info])
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_object_size').with_value(p[:backup_swift_object_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_backoff').with_value(p[:backup_swift_retry_backoff])