openstack
/
puppet-nova
Code Issues Proposed changes

Add support for [neutron] http_retries 

Change-Id: I269e22b557a023bb689882d04a51367b33e4ebb3
This commit is contained in:
Takashi Kajinami 2021-09-09 18:19:28 +09:00
parent f1b48f23ce
commit 0ecd597184
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/network/neutron.pp
View File

@ -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;
}
}

4
releasenotes/notes/neutron-http_retries-1fb5670b592e863f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``nova::network::neutron::http_retries`` parameter has been added.

4
spec/classes/nova_network_neutron_spec.rb
View File

@ -13,6 +13,7 @@ describe 'nova::network::neutron' do
:auth_url => 'http://127.0.0.1:5000/v3',
:valid_interfaces => '<SERVICE DEFAULT>',
:endpoint_override => '<SERVICE DEFAULT>',
:http_retries => '<SERVICE DEFAULT>',
: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