Inspector: Add support for [swift] delete_after
Change-Id: Ibe9ab3c380fbc3590ab72797921438f3427c7ca7
This commit is contained in:
@@ -54,6 +54,11 @@
|
||||
# String value
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*delete_after*]
|
||||
# (optional) Number of seconds that the Swift object will last before being
|
||||
# deleted.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
class ironic::inspector::swift (
|
||||
$auth_type = 'password',
|
||||
$auth_url = $::os_service_default,
|
||||
@@ -65,6 +70,7 @@ class ironic::inspector::swift (
|
||||
$region_name = $::os_service_default,
|
||||
$endpoint_override = $::os_service_default,
|
||||
$container = $::os_service_default,
|
||||
$delete_after = $::os_service_default,
|
||||
) {
|
||||
|
||||
$auth_type_real = pick($::ironic::inspector::swift_auth_type, $auth_type)
|
||||
@@ -88,5 +94,6 @@ class ironic::inspector::swift (
|
||||
'swift/region_name': value => $region_name_real;
|
||||
'swift/endpoint_override': value => $endpoint_override;
|
||||
'swift/container': value => $container_real;
|
||||
'swift/delete_after': value => $delete_after;
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``ironic::inspector::swift::delete_after`` parameter has been
|
||||
added.
|
@@ -44,6 +44,7 @@ describe 'ironic::inspector::swift' do
|
||||
is_expected.to contain_ironic_inspector_config('swift/region_name').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_inspector_config('swift/endpoint_override').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_inspector_config('swift/container').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_ironic_inspector_config('swift/delete_after').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
context 'when overriding parameters' do
|
||||
@@ -59,6 +60,7 @@ describe 'ironic::inspector::swift' do
|
||||
:region_name => 'regionTwo',
|
||||
:endpoint_override => 'http://example2.com',
|
||||
:container => 'mycontainer',
|
||||
:delete_after => 0,
|
||||
)
|
||||
end
|
||||
|
||||
@@ -73,6 +75,7 @@ describe 'ironic::inspector::swift' do
|
||||
is_expected.to contain_ironic_inspector_config('swift/region_name').with_value(p[:region_name])
|
||||
is_expected.to contain_ironic_inspector_config('swift/endpoint_override').with_value(p[:endpoint_override])
|
||||
is_expected.to contain_ironic_inspector_config('swift/container').with_value(p[:container])
|
||||
is_expected.to contain_ironic_inspector_config('swift/delete_after').with_value(0)
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user