openstack
/
puppet-glance
Code Issues Proposed changes

Swift: Add support for swift_store_retry_get_count 

Change-Id: I7bc7cd481a1e2b8d0497e294e47e2637b1dd4d80
This commit is contained in:
Takashi Kajinami 2022-01-27 21:33:18 +09:00
parent 137ab3c0b6
commit 5a95c9a5f2
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/backend/multistore/swift.pp
View File

@ -81,6 +81,11 @@
# Optional. Directory to buffer image segments before upload to Swift.
# Default: $::os_service_default.
#
# [*swift_store_retry_get_count*]
# Optional. The number of times a Swift download will be retried before
# the request fails.
# Defaults to $::os_service_default
#
# [*store_description*]
# (optional) Provides constructive information about the store backend to
# end users.
@ -108,6 +113,7 @@ define glance::backend::multistore::swift(
$default_swift_reference = 'ref1',
$swift_buffer_on_upload = $::os_service_default,
$swift_upload_buffer_dir = $::os_service_default,
$swift_store_retry_get_count = $::os_service_default,
$store_description = $::os_service_default,
# DEPRECATED PARAMETERS
$swift_store_config_file = undef,
@ -138,6 +144,7 @@ define glance::backend::multistore::swift(
"${name}/default_swift_reference": value => $default_swift_reference;
"${name}/swift_buffer_on_upload": value => $swift_buffer_on_upload;
"${name}/swift_upload_buffer_dir": value => $swift_upload_buffer_dir;
"${name}/swift_store_retry_get_count": value => $swift_store_retry_get_count;
"${name}/store_description": value => $store_description;
}

6
releasenotes/notes/swift_store_retry_get_count-cb650a2d17ca0b7f.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``glance::backend::multistore::glance`` now supports the new
``swift_store_retry_get_count`` parameter, to manage the same parameter
of swift store.

3
spec/defines/glance_backend_multistore_swift_spec.rb
View File

@ -51,6 +51,7 @@ describe 'glance::backend::multistore::swift' do
is_expected.to contain_glance_api_config('swift/default_swift_reference').with_value('ref1')
is_expected.to contain_glance_api_config('swift/swift_buffer_on_upload').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('swift/swift_upload_buffer_dir').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_api_config('swift/swift_store_retry_get_count').with_value('<SERVICE DEFAULT>')
is_expected.to contain_glance_swift_config('ref1/key').with_value('key').with_secret(true)
is_expected.to contain_glance_swift_config('ref1/user').with_value('user')
is_expected.to contain_glance_swift_config('ref1/auth_version').with_value('3')
@ -81,6 +82,7 @@ describe 'glance::backend::multistore::swift' do
:default_swift_reference => 'swift_creds',
:swift_buffer_on_upload => true,
:swift_upload_buffer_dir => '/var/glance/swift',
:swift_store_retry_get_count => 3,
}
end
@ -97,6 +99,7 @@ describe 'glance::backend::multistore::swift' do
is_expected.to contain_glance_api_config('swift/default_swift_reference').with_value('swift_creds')
is_expected.to contain_glance_api_config('swift/swift_buffer_on_upload').with_value(true)
is_expected.to contain_glance_api_config('swift/swift_upload_buffer_dir').with_value('/var/glance/swift')
is_expected.to contain_glance_api_config('swift/swift_store_retry_get_count').with_value(3)
is_expected.to contain_glance_swift_config('swift_creds/key').with_value('key2').with_secret(true)
is_expected.to contain_glance_swift_config('swift_creds/user').with_value('user2')
is_expected.to contain_glance_swift_config('swift_creds/auth_version').with_value('1')