openstack
/
puppet-cinder
Code Issues Proposed changes

Use backup driver class name 

https://review.openstack.org/#/c/595372 removed the capability to use
the loading by module name and requires that the backup driver class name
is provided.

This fix updates the defaults to use the full class name, for example
``cinder.backup.drivers.swift.SwiftBackupDriver``.

Change-Id: I188d9383937a8425a78611eb168d55264b7b5c9f
This commit is contained in:
Christian Schwede 2018-10-01 10:20:14 +02:00
parent dd23fe6bbb
commit 9a1b28cfb3
15 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/backup/ceph.pp
View File

@ -23,7 +23,7 @@
#
# [*backup_driver*]
# (optional) Which cinder backup driver to use
# Defaults to 'cinder.backup.drivers.ceph'
# Defaults to 'cinder.backup.drivers.ceph.CephBackupDriver'
#
# [*backup_ceph_conf*]
# (optional) Ceph config file to use.
@ -58,7 +58,7 @@
#
class cinder::backup::ceph (
$backup_driver = 'cinder.backup.drivers.ceph',
$backup_driver = 'cinder.backup.drivers.ceph.CephBackupDriver',
$backup_ceph_conf = '/etc/ceph/ceph.conf',
$backup_ceph_user = 'cinder',
$backup_ceph_chunk_size = '134217728',

4
manifests/backup/glusterfs.pp
View File

@ -6,7 +6,7 @@
#
# [*backup_driver*]
# (Optional) The backup driver for GlisterFS backend.
# Defaults to 'cinder.backup.drivers.glusterfs'.
# Defaults to 'cinder.backup.drivers.glusterfs.GlusterfsBackupDriver'.
#
# [*glusterfs_backup_mount_point*]
# (optional) Base dir container mount point for gluster share.
@ -39,7 +39,7 @@
#
#
class cinder::backup::glusterfs (
$backup_driver = 'cinder.backup.drivers.glusterfs',
$backup_driver = 'cinder.backup.drivers.glusterfs.GlusterfsBackupDriver',
$glusterfs_backup_mount_point = $::os_service_default,
$glusterfs_backup_share = $::os_service_default,
) {

4
manifests/backup/google.pp
View File

@ -6,7 +6,7 @@
#
# [*backup_driver*]
# (Optional) The backup driver for GCS back-end.
# Defaults to 'cinder.backup.drivers.google'.
# Defaults to 'cinder.backup.drivers.google.GoogleBackupDriver'.
#
# [*backup_gcs_bucket*]
# (optional) The GCS bucket to use.
@ -87,7 +87,7 @@
#
#
class cinder::backup::google (
$backup_driver = 'cinder.backup.drivers.google',
$backup_driver = 'cinder.backup.drivers.google.GoogleBackupDriver',
$backup_gcs_bucket = $::os_service_default,
$backup_gcs_object_size = $::os_service_default,
$backup_gcs_block_size = $::os_service_default,

4
manifests/backup/nfs.pp
View File

@ -10,7 +10,7 @@
#
# [*backup_driver*]
# (optional) The backup driver for NFS back-end.
# Defaults to 'cinder.backup.drivers.nfs'.
# Defaults to 'cinder.backup.drivers.nfs.NFSBackupDriver'.
#
# [*backup_file_size*]
# (optional) The maximum size in bytes of the files used to hold
@ -70,7 +70,7 @@
#
class cinder::backup::nfs (
$backup_share,
$backup_driver = 'cinder.backup.drivers.nfs',
$backup_driver = 'cinder.backup.drivers.nfs.NFSBackupDriver',
$backup_file_size = $::os_service_default,
$backup_sha_block_size_bytes = $::os_service_default,
$backup_enable_progress_timer = $::os_service_default,

4
manifests/backup/posix.pp
View File

@ -6,7 +6,7 @@
#
# [*backup_driver*]
# (Optional) The backup driver for posix backend.
# Defaults to 'cinder.backup.drivers.posix'.
# Defaults to 'cinder.backup.drivers.posix.PosixBackupDriver'.
#
# [*backup_file_size*]
# (optional) The maximum size in bytes of the files used to hold backups.
@ -56,7 +56,7 @@
#
#
class cinder::backup::posix (
$backup_driver = 'cinder.backup.drivers.posix',
$backup_driver = 'cinder.backup.drivers.posix.PosixBackupDriver',
$backup_file_size = $::os_service_default,
$backup_sha_block_size_bytes = $::os_service_default,
$backup_posix_path = $::os_service_default,

4
manifests/backup/swift.pp
View File

@ -6,7 +6,7 @@
#
# [*backup_driver*]
# (Optional) The backup driver for Swift back-end.
# Defaults to 'cinder.backup.drivers.swift'.
# Defaults to 'cinder.backup.drivers.swift.SwiftBackupDriver'.
#
# [*backup_swift_url*]
# (optional) The URL of the Swift endpoint.
@ -75,7 +75,7 @@
#
#
class cinder::backup::swift (
$backup_driver = 'cinder.backup.drivers.swift',
$backup_driver = 'cinder.backup.drivers.swift.SwiftBackupDriver',
$backup_swift_url = $::os_service_default,
$backup_swift_auth_url = $::os_service_default,
$backup_swift_container = 'volumebackups',

4
manifests/backup/tsm.pp
View File

@ -6,7 +6,7 @@
#
# [*backup_driver*]
# (Optional) The backup driver for tsm backend.
# Defaults to 'cinder.backup.drivers.tsm'.
# Defaults to 'cinder.backup.drivers.tsm.TSMBackupDriver'.
#
# [*backup_tsm_volume_prefix*]
# (optional) Volume prefix for the backup id when backing up to TSM.
@ -42,7 +42,7 @@
#
#
class cinder::backup::tsm (
$backup_driver = 'cinder.backup.drivers.tsm',
$backup_driver = 'cinder.backup.drivers.tsm.TSMBackupDriver',
$backup_tsm_volume_prefix = $::os_service_default,
$backup_tsm_password = $::os_service_default,
$backup_tsm_compression = $::os_service_default,

7
releasenotes/notes/cinder-backup-driver-use-classname-910b92dfb6e67697.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
The ability to specify a Cinder backup driver by module name was deprecated
in the Queens release and the ability has now been removed in Cinder. This
fix updates the defaults to use the full module name, for example
``cinder.backup.drivers.swift.SwiftBackupDriver``.

2
spec/classes/cinder_backup_ceph_spec.rb
View File

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

2
spec/classes/cinder_backup_glusterfs_spec.rb
View File

@ -37,7 +37,7 @@ describe 'cinder::backup::glusterfs' do
end
it 'configures cinder.conf' do
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.glusterfs')
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.glusterfs.GlusterfsBackupDriver')
is_expected.to contain_cinder_config('DEFAULT/glusterfs_backup_mount_point').with_value(p[:glusterfs_backup_mount_point])
is_expected.to contain_cinder_config('DEFAULT/glusterfs_backup_share').with_value(p[:glusterfs_backup_share])
end

2
spec/classes/cinder_backup_google_spec.rb
View File

@ -48,7 +48,7 @@ describe 'cinder::backup::google' do
end
it 'configures cinder.conf' do
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.google')
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.google.GoogleBackupDriver')
is_expected.to contain_cinder_config('DEFAULT/backup_gcs_bucket').with_value(p[:backup_gcs_bucket])
is_expected.to contain_cinder_config('DEFAULT/backup_gcs_object_size').with_value(p[:backup_gcs_object_size])
is_expected.to contain_cinder_config('DEFAULT/backup_gcs_block_size').with_value(p[:backup_gcs_block_size])

2
spec/classes/cinder_backup_nfs_spec.rb
View File

@ -32,7 +32,7 @@ describe 'cinder::backup::nfs' do
let :default_params do
{
:backup_driver => 'cinder.backup.drivers.nfs',
:backup_driver => 'cinder.backup.drivers.nfs.NFSBackupDriver',
:backup_file_size => '<SERVICE DEFAULT>',
:backup_sha_block_size_bytes => '<SERVICE DEFAULT>',
:backup_enable_progress_timer => '<SERVICE DEFAULT>',

2
spec/classes/cinder_backup_posix_spec.rb
View File

@ -40,7 +40,7 @@ describe 'cinder::backup::posix' do
end
it 'configures cinder.conf' do
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.posix')
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.posix.PosixBackupDriver')
is_expected.to contain_cinder_config('DEFAULT/backup_file_size').with_value(p[:backup_file_size])
is_expected.to contain_cinder_config('DEFAULT/backup_sha_block_size_bytes').with_value(p[:backup_sha_block_size_bytes])
is_expected.to contain_cinder_config('DEFAULT/backup_posix_path').with_value(p[:backup_posix_path])

2
spec/classes/cinder_backup_swift_spec.rb
View File

@ -45,7 +45,7 @@ describe 'cinder::backup::swift' do
end
it 'configures cinder.conf' do
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.swift')
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.swift.SwiftBackupDriver')
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_auth_url').with_value(p[:backup_swift_auth_url])
is_expected.to contain_cinder_config('DEFAULT/backup_swift_container').with_value(p[:backup_swift_container])

2
spec/classes/cinder_backup_tsm_spec.rb
View File

@ -38,7 +38,7 @@ describe 'cinder::backup::tsm' do
end
it 'configures cinder.conf' do
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.tsm')
is_expected.to contain_cinder_config('DEFAULT/backup_driver').with_value('cinder.backup.drivers.tsm.TSMBackupDriver')
is_expected.to contain_cinder_config('DEFAULT/backup_tsm_volume_prefix').with_value(p[:backup_tsm_volume_prefix])
is_expected.to contain_cinder_config('DEFAULT/backup_tsm_password').with_value(p[:backup_tsm_password]).with_secret(true)
is_expected.to contain_cinder_config('DEFAULT/backup_tsm_compression').with_value(p[:backup_tsm_compression])