openstack
/
puppet-octavia
Code Issues Proposed changes

Add build_active_retries and port_detach_timeout 

Parameter build_active_retries sets retry threshold for waiting for a
build slot for an amphorae.

Parameter port_detach_timeout sets seconds to wait for a port to detach
from an amphora

Change-Id: I5e2d2db8e7113e0c50b7cbd6a7ed383492477180
This commit is contained in:
Carlos Goncalves 2019-09-17 14:57:50 +02:00
parent 31d89635eb
commit 96fa23758d
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/controller.pp
View File

@ -78,6 +78,14 @@
# (optional) Number of seconds to wait between connection attempts to amphora.
# Defaults to $::os_service_default
#
# [*build_active_retries*]
# (optional) Retry threshold for waiting for a build slot for an amphorae.
# Defaults to $::os_service_default
#
# [*port_detach_timeout*]
# (optional) Seconds to wait for a port to detach from an amphora.
# Defaults to $::os_service_default
#
class octavia::controller (
$amp_flavor_id = '65',
$amp_image_tag = $::os_service_default,
@ -96,6 +104,8 @@ class octavia::controller (
$controller_ip_port_list = $::os_service_default,
$connection_max_retries = $::os_service_default,
$connection_retry_interval = $::os_service_default,
$build_active_retries = $::os_service_default,
$port_detach_timeout = $::os_service_default,
) inherits octavia::params {
include ::octavia::deps
@ -145,5 +155,7 @@ class octavia::controller (
'health_manager/controller_ip_port_list' : value => $controller_ip_port_list;
'haproxy_amphora/connection_max_retries' : value => $connection_max_retries;
'haproxy_amphora/connection_retry_interval' : value => $connection_retry_interval;
'haproxy_amphora/build_active_retries' : value => $build_active_retries;
'networking/port_detach_timeout' : value => $port_detach_timeout;
}
}

3
releasenotes/notes/add-build-active-retries-and-port-detach-timeout-parameters-5dc21de1a97699ef.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Added build_active_retries and port_detach_timeout parameters.

8
spec/classes/octavia_controller_spec.rb
View File

@ -21,7 +21,9 @@ describe 'octavia::controller' do
:amp_ssh_key_name => 'custom-amphora-key',
:controller_ip_port_list => '1.2.3.4:5555,4.3.2.1:5555',
:connection_max_retries => 240,
:connection_retry_interval => 10
:connection_retry_interval => 10,
:build_active_retries => 5,
:port_detach_timeout => 15
}
end
@ -34,6 +36,8 @@ describe 'octavia::controller' do
it { is_expected.to contain_octavia_config('health_manager/controller_ip_port_list').with_value('1.2.3.4:5555,4.3.2.1:5555') }
it { is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value(240) }
it { is_expected.to contain_octavia_config('haproxy_amphora/connection_retry_interval').with_value(10) }
it { is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value(5) }
it { is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15) }
end
it 'configures worker parameters' do
@ -48,6 +52,8 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('haproxy_amphora/timeout_tcp_inspect').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/connection_retry_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value('<SERVICE DEFAULT>')
end
context 'with ssh key access disabled' do