diff --git a/manifests/cinder.pp b/manifests/cinder.pp index ce8a1e039..cce2c5f22 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -62,6 +62,11 @@ # :: # 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 ( $password = $::os_service_default, $auth_type = $::os_service_default, @@ -74,6 +79,7 @@ class nova::cinder ( $user_domain_name = 'Default', $os_region_name = $::os_service_default, $catalog_info = $::os_service_default, + $http_retries = $::os_service_default, ) { include nova::deps @@ -93,5 +99,6 @@ class nova::cinder ( 'cinder/user_domain_name': value => $user_domain_name; 'cinder/os_region_name': value => $os_region_name_real; 'cinder/catalog_info': value => $catalog_info_real; + 'cinder/http_retries': value => $http_retries; } } diff --git a/releasenotes/notes/cinder-http_retries-9e53569312f18cb8.yaml b/releasenotes/notes/cinder-http_retries-9e53569312f18cb8.yaml new file mode 100644 index 000000000..122c4b88f --- /dev/null +++ b/releasenotes/notes/cinder-http_retries-9e53569312f18cb8.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``nova::cinder::http_retries`` parameter has been added. diff --git a/spec/classes/nova_cinder_spec.rb b/spec/classes/nova_cinder_spec.rb index 9f7fb328d..1004ba85c 100644 --- a/spec/classes/nova_cinder_spec.rb +++ b/spec/classes/nova_cinder_spec.rb @@ -17,6 +17,7 @@ describe 'nova::cinder' do should contain_nova_config('cinder/user_domain_name').with_value('Default') should contain_nova_config('cinder/os_region_name').with_value('') should contain_nova_config('cinder/catalog_info').with_value('') + should contain_nova_config('cinder/http_retries').with_value('') end end @@ -31,6 +32,7 @@ describe 'nova::cinder' do :region_name => 'RegionOne', :os_region_name => 'RegionOne', :catalog_info => 'volumev3:cinderv3:publicURL', + :http_retries => 3, } 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/os_region_name').with_value('RegionOne') should contain_nova_config('cinder/catalog_info').with_value('volumev3:cinderv3:publicURL') + should contain_nova_config('cinder/http_retries').with_value(3) end end