From 9c24dbc63a5801bcb117411dd6c4e139e70b9f41 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 7 Mar 2022 20:38:17 +0900 Subject: [PATCH] Add support for [haproxy_amphora] default_connection_limit ... which was added during Ussuri cycle[1]. [1] f4305e036c30b23588d7d1448448010b95c24069 Change-Id: I3ee2fa2e02fd24b6eb357c7ffb69a3bbfe74c1a9 --- manifests/controller.pp | 6 ++++++ .../notes/default_connection_limit-4006e77c67997e01.yaml | 5 +++++ spec/classes/octavia_controller_spec.rb | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 releasenotes/notes/default_connection_limit-4006e77c67997e01.yaml diff --git a/manifests/controller.pp b/manifests/controller.pp index 99e62ade..c0c23cbe 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -137,6 +137,10 @@ # (optional) Retry timeout between build attempts in seconds. # Defaults to $::os_service_default # +# [*default_connection_limit*] +# (optional) Default connection_limit for listeners. +# Defaults to $::os_service_default +# # [*admin_log_targets*] # (optional) The list of syslog endpoints, host:port comma separated list, # to receive administrative log messages. @@ -233,6 +237,7 @@ class octavia::controller ( $build_rate_limit = $::os_service_default, $build_active_retries = $::os_service_default, $build_retry_interval = $::os_service_default, + $default_connection_limit = $::os_service_default, $admin_log_targets = $::os_service_default, $administrative_log_facility = $::os_service_default, $forward_all_logs = $::os_service_default, @@ -300,6 +305,7 @@ Use the octavia::networking class instead') 'haproxy_amphora/build_rate_limit' : value => $build_rate_limit; 'haproxy_amphora/build_active_retries' : value => $build_active_retries; 'haproxy_amphora/build_retry_interval' : value => $build_retry_interval; + 'haproxy_amphora/default_connection_limit' : value => $default_connection_limit; 'amphora_agent/admin_log_targets' : value => join(any2array($admin_log_targets), ','); 'amphora_agent/administrative_log_facility' : value => $administrative_log_facility; 'amphora_agent/forward_all_logs' : value => $forward_all_logs; diff --git a/releasenotes/notes/default_connection_limit-4006e77c67997e01.yaml b/releasenotes/notes/default_connection_limit-4006e77c67997e01.yaml new file mode 100644 index 00000000..639eed25 --- /dev/null +++ b/releasenotes/notes/default_connection_limit-4006e77c67997e01.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``octavia::controller::default_connection_limit`` parameter has been + added. diff --git a/spec/classes/octavia_controller_spec.rb b/spec/classes/octavia_controller_spec.rb index 1be0ca52..f48e1bda 100644 --- a/spec/classes/octavia_controller_spec.rb +++ b/spec/classes/octavia_controller_spec.rb @@ -41,6 +41,7 @@ describe 'octavia::controller' do :build_rate_limit => 10, :build_active_retries => 120, :build_retry_interval => 5, + :default_connection_limit => 50000, :port_detach_timeout => 15, :admin_log_targets => ['192.0.2.1:10514', '2001:db8:1::10:10514'], :administrative_log_facility => 2, @@ -87,6 +88,7 @@ describe 'octavia::controller' do is_expected.to contain_octavia_config('haproxy_amphora/build_rate_limit').with_value(10) is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value(120) is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value(5) + is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value(50000) is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15) is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('192.0.2.1:10514,2001:db8:1::10:10514') is_expected.to contain_octavia_config('amphora_agent/administrative_log_facility').with_value(2) @@ -134,6 +136,7 @@ describe 'octavia::controller' do is_expected.to contain_octavia_config('haproxy_amphora/build_rate_limit').with_value('') is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value('') is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value('') + is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value('') is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value('') is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('') is_expected.to contain_octavia_config('amphora_agent/administrative_log_facility').with_value('')