diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index f98dd25e5..8d59ee1c3 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -55,6 +55,11 @@ # through the OpenStack Identity service. # Defaults to 'RegionOne' # +# [*http_retries*] +# (optional) Number of times neutronclient should retry on any failed http +# call. +# Defaults to $::os_service_default +# # [*ovs_bridge*] # (optional) Name of Integration Bridge used by Open vSwitch # Defaults to 'br-int' @@ -91,6 +96,7 @@ class nova::network::neutron ( $endpoint_override = $::os_service_default, $timeout = '30', $region_name = 'RegionOne', + $http_retries = $::os_service_default, $ovs_bridge = 'br-int', $extension_sync_interval = '600', $vif_plugging_is_fatal = true, @@ -117,5 +123,6 @@ class nova::network::neutron ( 'neutron/ovs_bridge': value => $ovs_bridge; 'neutron/extension_sync_interval': value => $extension_sync_interval; 'neutron/auth_type': value => $auth_type; + 'neutron/http_retries': value => $http_retries; } } diff --git a/releasenotes/notes/neutron-http_retries-1fb5670b592e863f.yaml b/releasenotes/notes/neutron-http_retries-1fb5670b592e863f.yaml new file mode 100644 index 000000000..c2a9a46d5 --- /dev/null +++ b/releasenotes/notes/neutron-http_retries-1fb5670b592e863f.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``nova::network::neutron::http_retries`` parameter has been added. diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb index fcc613d72..55a37703d 100644 --- a/spec/classes/nova_network_neutron_spec.rb +++ b/spec/classes/nova_network_neutron_spec.rb @@ -13,6 +13,7 @@ describe 'nova::network::neutron' do :auth_url => 'http://127.0.0.1:5000/v3', :valid_interfaces => '', :endpoint_override => '', + :http_retries => '', :ovs_bridge => 'br-int', :extension_sync_interval => '600', :vif_plugging_is_fatal => true, @@ -42,6 +43,7 @@ describe 'nova::network::neutron' do should contain_nova_config('neutron/auth_url').with_value(default_params[:auth_url]) should contain_nova_config('neutron/valid_interfaces').with_value(default_params[:valid_interfaces]) should contain_nova_config('neutron/endpoint_override').with_value(default_params[:endpoint_override]) + should contain_nova_config('neutron/http_retries').with_value(default_params[:http_retries]) should contain_nova_config('neutron/extension_sync_interval').with_value(default_params[:extension_sync_interval]) should contain_nova_config('neutron/ovs_bridge').with_value(default_params[:ovs_bridge]) end @@ -64,6 +66,7 @@ describe 'nova::network::neutron' do :auth_url => 'http://10.0.0.1:5000/v2', :valid_interfaces => 'public', :endpoint_override => 'http://127.0.0.1:9696', + :http_retries => 3, :ovs_bridge => 'br-int', :extension_sync_interval => '600', :vif_plugging_is_fatal => false, @@ -84,6 +87,7 @@ describe 'nova::network::neutron' do should contain_nova_config('neutron/auth_url').with_value(params[:auth_url]) should contain_nova_config('neutron/valid_interfaces').with_value(params[:valid_interfaces]) should contain_nova_config('neutron/endpoint_override').with_value(params[:endpoint_override]) + should contain_nova_config('neutron/http_retries').with_value(params[:http_retries]) should contain_nova_config('neutron/extension_sync_interval').with_value(params[:extension_sync_interval]) should contain_nova_config('neutron/ovs_bridge').with_value(params[:ovs_bridge]) end