openstack/puppet-octavia
Code Issues Proposed changes

Add posibilities to set default values for timeouts

Browse Source 
Partial-Bug: 1797130
Depends-On https://review.openstack.org/609418/
Story: 2004042
Task: 27047
Change-Id: I03e180d1c57735822f793bf0d06130d97e00eafe
This commit is contained in:
Kamil Sambor 2018-10-10 16:28:46 +02:00 committed by Tobias Urdin
parent 7acccc6b09
commit 2bf9dc6ab6
3 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
manifests/worker.pp
View File

@ -88,26 +88,46 @@
# (optional) Set the project to be used for creating load balancer instances.
# Defaults to undef
#
# [*timeout_client_data*]
# (optional) Frontend client inactivity timeout.
# Defaults to $::os_service_default
#
# [*timeout_member_connect*]
# (optional) Backend member connection timeout.
# Defaults to $::os_service_default
#
# [*timeout_member_data*]
# (optional) Backend member inactivity timeout.'
# Defaults to $::os_service_default
#
# [*timeout_tcp_inspect*]
# (optional) Time to wait for TCP packets for content inspection.
# Defaults to $::os_service_default
#
class octavia::worker (
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$workers = $::os_service_default,
$amp_flavor_id = '65',
$amp_image_tag = $::os_service_default,
$amp_secgroup_list = $::os_service_default,
$amp_boot_network_list = [],
$loadbalancer_topology = $::os_service_default,
$manage_nova_flavor = true,
$nova_flavor_config = {},
$amphora_driver = 'amphora_haproxy_rest_driver',
$compute_driver = 'compute_nova_driver',
$network_driver = 'allowed_address_pairs_driver',
$amp_ssh_key_name = 'octavia-ssh-key',
$enable_ssh_access = true,
$key_path = '/etc/octavia/.ssh/octavia_ssh_key',
$manage_keygen = false,
$amp_project_name = undef
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$workers = $::os_service_default,
$amp_flavor_id = '65',
$amp_image_tag = $::os_service_default,
$amp_secgroup_list = $::os_service_default,
$amp_boot_network_list = [],
$loadbalancer_topology = $::os_service_default,
$manage_nova_flavor = true,
$nova_flavor_config = {},
$amphora_driver = 'amphora_haproxy_rest_driver',
$compute_driver = 'compute_nova_driver',
$network_driver = 'allowed_address_pairs_driver',
$amp_ssh_key_name = 'octavia-ssh-key',
$enable_ssh_access = true,
$key_path = '/etc/octavia/.ssh/octavia_ssh_key',
$manage_keygen = false,
$amp_project_name = undef,
$timeout_client_data = $::os_service_default,
$timeout_member_connect = $::os_service_default,
$timeout_member_data = $::os_service_default,
$timeout_tcp_inspect = $::os_service_default,
) inherits octavia::params {
include ::octavia::deps
@ -223,5 +243,9 @@ class octavia::worker (
'controller_worker/network_driver' : value => $network_driver;
'controller_worker/amp_ssh_key_name' : value => $ssh_key_name_real;
'haproxy_amphora/key_path' : value => $key_path_real;
'haproxy_amphora/timeout_client_data' : value => $timeout_client_data;
'haproxy_amphora/timeout_member_connect' : value => $timeout_member_connect;
'haproxy_amphora/timeout_member_data' : value => $timeout_member_data;
'haproxy_amphora/timeout_tcp_inspect' : value => $timeout_tcp_inspect;
}
}

11
releasenotes/notes/bug-1797130-789318b2dff121d3.yaml Normal file
View File

@ -0,0 +1,11 @@
---
features:
- |
Listeners default timeouts can be set by config in section haproxy_amphora:
* `timeout_client_data`: Frontend client inactivity timeout
* `timeout_member_connect`: Backend member connection timeout
* `timeout_member_data`: Backend member inactivity timeout
* `timeout_tcp_inspect`: Time to wait for TCP packets for content inspection
The value for all of these options is expected to be in milliseconds.

4
spec/classes/octavia_worker_spec.rb
View File

@ -74,6 +74,10 @@ describe 'octavia::worker' do
is_expected.to contain_octavia_config('controller_worker/network_driver').with_value('allowed_address_pairs_driver')
is_expected.to contain_octavia_config('controller_worker/amp_ssh_key_name').with_value('octavia-ssh-key')
is_expected.to contain_octavia_config('haproxy_amphora/key_path').with_value('/etc/octavia/.ssh/octavia_ssh_key')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_client_data').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_connect').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_member_data').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/timeout_tcp_inspect').with_value('<SERVICE DEFAULT>')
end
context 'with ssh key access disabled' do