Add support for [cinder] http_retries
Change-Id: I0def16be7728b08bdf4baf4310fd9c91856f5f2f
This commit is contained in:
@@ -62,6 +62,11 @@
|
|||||||
# <service_type>:<service_name>:<endpoint_type>
|
# <service_type>:<service_name>:<endpoint_type>
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*http_retries*]
|
||||||
|
# (optional) Number of times cinderclient should retry on any failed http
|
||||||
|
# call.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class nova::cinder (
|
class nova::cinder (
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
$auth_type = $::os_service_default,
|
$auth_type = $::os_service_default,
|
||||||
@@ -74,6 +79,7 @@ class nova::cinder (
|
|||||||
$user_domain_name = 'Default',
|
$user_domain_name = 'Default',
|
||||||
$os_region_name = $::os_service_default,
|
$os_region_name = $::os_service_default,
|
||||||
$catalog_info = $::os_service_default,
|
$catalog_info = $::os_service_default,
|
||||||
|
$http_retries = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
@@ -93,5 +99,6 @@ class nova::cinder (
|
|||||||
'cinder/user_domain_name': value => $user_domain_name;
|
'cinder/user_domain_name': value => $user_domain_name;
|
||||||
'cinder/os_region_name': value => $os_region_name_real;
|
'cinder/os_region_name': value => $os_region_name_real;
|
||||||
'cinder/catalog_info': value => $catalog_info_real;
|
'cinder/catalog_info': value => $catalog_info_real;
|
||||||
|
'cinder/http_retries': value => $http_retries;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``nova::cinder::http_retries`` parameter has been added.
|
||||||
@@ -17,6 +17,7 @@ describe 'nova::cinder' do
|
|||||||
should contain_nova_config('cinder/user_domain_name').with_value('Default')
|
should contain_nova_config('cinder/user_domain_name').with_value('Default')
|
||||||
should contain_nova_config('cinder/os_region_name').with_value('<SERVICE DEFAULT>')
|
should contain_nova_config('cinder/os_region_name').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
|
should contain_nova_config('cinder/catalog_info').with_value('<SERVICE DEFAULT>')
|
||||||
|
should contain_nova_config('cinder/http_retries').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
@@ -31,6 +32,7 @@ describe 'nova::cinder' do
|
|||||||
:region_name => 'RegionOne',
|
:region_name => 'RegionOne',
|
||||||
:os_region_name => 'RegionOne',
|
:os_region_name => 'RegionOne',
|
||||||
:catalog_info => 'volumev3:cinderv3:publicURL',
|
:catalog_info => 'volumev3:cinderv3:publicURL',
|
||||||
|
:http_retries => 3,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -46,6 +48,7 @@ describe 'nova::cinder' do
|
|||||||
should contain_nova_config('cinder/user_domain_name').with_value('Default')
|
should contain_nova_config('cinder/user_domain_name').with_value('Default')
|
||||||
should contain_nova_config('cinder/os_region_name').with_value('RegionOne')
|
should contain_nova_config('cinder/os_region_name').with_value('RegionOne')
|
||||||
should contain_nova_config('cinder/catalog_info').with_value('volumev3:cinderv3:publicURL')
|
should contain_nova_config('cinder/catalog_info').with_value('volumev3:cinderv3:publicURL')
|
||||||
|
should contain_nova_config('cinder/http_retries').with_value(3)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user