openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Add support for [haproxy_amphora] build_rate_limit"

This commit is contained in:
Zuul 2021-03-26 05:00:12 +00:00 committed by Gerrit Code Review
parent b417b88a2a fed08d5bdb
commit fc9dd0286a
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/controller.pp
View File

@ -102,6 +102,11 @@
# endpoints.
# Defaults to $::os_service_default
#
# [*build_rate_limit*]
# (optional) Number of amphorae that could be build per controller worker,
# simultaneously.
# 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
@ -192,6 +197,7 @@ class octavia::controller (
$connection_max_retries = $::os_service_default,
$connection_retry_interval = $::os_service_default,
$connection_logging = $::os_service_default,
$build_rate_limit = $::os_service_default,
$build_active_retries = $::os_service_default,
$port_detach_timeout = $::os_service_default,
$admin_log_targets = $::os_service_default,
@ -245,6 +251,7 @@ class octavia::controller (
'haproxy_amphora/connection_max_retries' : value => $connection_max_retries;
'haproxy_amphora/connection_retry_interval' : value => $connection_retry_interval;
'haproxy_amphora/connection_logging' : value => $connection_logging;
'haproxy_amphora/build_rate_limit' : value => $build_rate_limit;
'haproxy_amphora/build_active_retries' : value => $build_active_retries;
'networking/port_detach_timeout' : value => $port_detach_timeout;
'amphora_agent/admin_log_targets' : value => $admin_log_targets;

5
releasenotes/notes/build_rate_limit-7da036d02e5ccea8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Support for the ``[haproxy_amphora] build_rate_limit`` parameter has been
added.

3
spec/classes/octavia_controller_spec.rb
View File

@ -33,6 +33,7 @@ describe 'octavia::controller' do
:connection_max_retries => 240,
:connection_retry_interval => 10,
:connection_logging => false,
:build_rate_limit => 10,
:build_active_retries => 5,
:port_detach_timeout => 15,
:admin_log_targets => '192.0.2.1:10514,2001:db8:1::10:10514',
@ -72,6 +73,7 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value(240)
is_expected.to contain_octavia_config('haproxy_amphora/connection_retry_interval').with_value(10)
is_expected.to contain_octavia_config('haproxy_amphora/connection_logging').with_value(false)
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(5)
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')
@ -112,6 +114,7 @@ describe 'octavia::controller' do
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/connection_logging').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/build_rate_limit').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>')
is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('<SERVICE DEFAULT>')