Merge "Support more options of Swift storage driver"
This commit is contained in:
commit
3da62d2c18
|
@ -59,6 +59,14 @@
|
|||
# (publicURL, internalURL or adminURL).
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*swift_service_type*]
|
||||
# (optional) A string giving the service type of the swift service to use.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*swift_timeout*]
|
||||
# (optional) Connection timeout in seconds.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*swift_tenant_name*]
|
||||
|
@ -76,6 +84,8 @@ class gnocchi::storage::swift(
|
|||
$swift_project_domain_name = $::os_service_default,
|
||||
$swift_region = $::os_service_default,
|
||||
$swift_endpoint_type = $::os_service_default,
|
||||
$swift_service_type = $::os_service_default,
|
||||
$swift_timeout = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$swift_tenant_name = undef,
|
||||
) {
|
||||
|
@ -101,6 +111,8 @@ will be removed in a future release. Use swift_project_name instead')
|
|||
'storage/swift_auth_version': value => $swift_auth_version;
|
||||
'storage/swift_authurl': value => $swift_authurl;
|
||||
'storage/swift_endpoint_type': value => $swift_endpoint_type;
|
||||
'storage/swift_service_type': value => $swift_service_type;
|
||||
'storage/swift_timeout': value => $swift_timeout;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
The following two parameters have been added to ``swift::storage::swift``
|
||||
|
||||
- ``swift_service_type``
|
||||
- ``swift_timeout``
|
|
@ -23,6 +23,8 @@ describe 'gnocchi::storage::swift' do
|
|||
is_expected.to contain_gnocchi_config('storage/swift_region').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_auth_version').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_endpoint_type').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_service_type').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_timeout').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -38,6 +40,8 @@ describe 'gnocchi::storage::swift' do
|
|||
:swift_region => 'regionOne',
|
||||
:swift_auth_version => 2,
|
||||
:swift_endpoint_type => 'publicURL',
|
||||
:swift_service_type => 'object-store',
|
||||
:swift_timeout => 0
|
||||
})
|
||||
end
|
||||
|
||||
|
@ -52,6 +56,8 @@ describe 'gnocchi::storage::swift' do
|
|||
is_expected.to contain_gnocchi_config('storage/swift_region').with_value('regionOne')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_auth_version').with_value(2)
|
||||
is_expected.to contain_gnocchi_config('storage/swift_endpoint_type').with_value('publicURL')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_service_type').with_value('object-store')
|
||||
is_expected.to contain_gnocchi_config('storage/swift_timeout').with_value(0)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue