diff --git a/manifests/backup/swift.pp b/manifests/backup/swift.pp index a3fbd0fb..8baf8bbe 100644 --- a/manifests/backup/swift.pp +++ b/manifests/backup/swift.pp @@ -29,6 +29,11 @@ # (optional) The backoff time in seconds between Swift retries. # Defaults to '2' # +# [*backup_compression_algorithm*] +# (optional) The compression algorithm for the chunks sent to swift +# Defaults to 'zlib' +# set to None to disable compression +# # === Author(s) # # Emilien Macchi @@ -51,21 +56,23 @@ # # class cinder::backup::swift ( - $backup_driver = 'cinder.backup.drivers.swift', - $backup_swift_url = 'http://localhost:8080/v1/AUTH_', - $backup_swift_container = 'volumes_backup', - $backup_swift_object_size = '52428800', - $backup_swift_retry_attempts = '3', - $backup_swift_retry_backoff = '2' + $backup_driver = 'cinder.backup.drivers.swift', + $backup_swift_url = 'http://localhost:8080/v1/AUTH_', + $backup_swift_container = 'volumes_backup', + $backup_swift_object_size = '52428800', + $backup_swift_retry_attempts = '3', + $backup_swift_retry_backoff = '2', + $backup_compression_algorithm = 'zlib', ) { cinder_config { - 'DEFAULT/backup_driver': value => $backup_driver; - 'DEFAULT/backup_swift_url': value => $backup_swift_url; - '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_driver': value => $backup_driver; + 'DEFAULT/backup_swift_url': value => $backup_swift_url; + '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_compression_algorithm': value => $backup_compression_algorithm; } } diff --git a/spec/classes/cinder_backup_swift_spec.rb b/spec/classes/cinder_backup_swift_spec.rb index 65c1789b..50593798 100644 --- a/spec/classes/cinder_backup_swift_spec.rb +++ b/spec/classes/cinder_backup_swift_spec.rb @@ -23,11 +23,12 @@ require 'spec_helper' describe 'cinder::backup::swift' do let :default_params do - { :backup_swift_url => 'http://localhost:8080/v1/AUTH_', - :backup_swift_container => 'volumes_backup', - :backup_swift_object_size => '52428800', - :backup_swift_retry_attempts => '3', - :backup_swift_retry_backoff => '2' } + { :backup_swift_url => 'http://localhost:8080/v1/AUTH_', + :backup_swift_container => 'volumes_backup', + :backup_swift_object_size => '52428800', + :backup_swift_retry_attempts => '3', + :backup_swift_retry_backoff => '2', + :backup_compression_algorithm => 'zlib' } end let :params do @@ -46,6 +47,7 @@ describe 'cinder::backup::swift' do 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]) + is_expected.to contain_cinder_config('DEFAULT/backup_compression_algorithm').with_value(p[:backup_compression_algorithm]) end context 'when overriding default parameters' do @@ -55,6 +57,7 @@ describe 'cinder::backup::swift' do params.merge!(:backup_swift_object_size => '123') params.merge!(:backup_swift_retry_attempts => '99') params.merge!(:backup_swift_retry_backoff => '56') + params.merge!(:backup_compression_algorithm => 'None') end 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]) @@ -62,6 +65,7 @@ describe 'cinder::backup::swift' do 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]) + is_expected.to contain_cinder_config('DEFAULT/backup_compression_algorithm').with_value(p[:backup_compression_algorithm]) end end end