Browse Source

Merge "Add support for [haproxy_amphora] build_retry_interval"

changes/79/825779/1
Zuul 4 months ago committed by Gerrit Code Review
parent
commit
436ea0d973
  1. 6
      manifests/controller.pp
  2. 5
      releasenotes/notes/build_retry_interval-96aa9efb9689362d.yaml
  3. 7
      spec/classes/octavia_controller_spec.rb

6
manifests/controller.pp

@ -115,6 +115,10 @@
# (optional) Retry threshold for waiting for a build slot for an amphorae.
# Defaults to $::os_service_default
#
# [*build_retry_interval*]
# (optional) Retry timeout between build attempts in seconds.
# Defaults to $::os_service_default
#
# [*admin_log_targets*]
# (optional) The list of syslog endpoints, host:port comma separated list,
# to receive administrative log messages.
@ -206,6 +210,7 @@ class octavia::controller (
$connection_logging = $::os_service_default,
$build_rate_limit = $::os_service_default,
$build_active_retries = $::os_service_default,
$build_retry_interval = $::os_service_default,
$admin_log_targets = $::os_service_default,
$administrative_log_facility = $::os_service_default,
$forward_all_logs = $::os_service_default,
@ -268,6 +273,7 @@ Use the octavia::networking class instead')
'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;
'haproxy_amphora/build_retry_interval' : value => $build_retry_interval;
'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;

5
releasenotes/notes/build_retry_interval-96aa9efb9689362d.yaml

@ -0,0 +1,5 @@
---
features:
- |
The new ``octavia::controller::build_retry_interval`` parameter has been
added.

7
spec/classes/octavia_controller_spec.rb

@ -35,7 +35,8 @@ describe 'octavia::controller' do
:connection_retry_interval => 10,
:connection_logging => false,
:build_rate_limit => 10,
:build_active_retries => 5,
:build_active_retries => 120,
:build_retry_interval => 5,
:port_detach_timeout => 15,
:admin_log_targets => ['192.0.2.1:10514', '2001:db8:1::10:10514'],
:administrative_log_facility => 2,
@ -76,7 +77,8 @@ describe 'octavia::controller' do
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('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('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)
@ -119,6 +121,7 @@ describe 'octavia::controller' do
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('haproxy_amphora/build_retry_interval').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>')
is_expected.to contain_octavia_config('amphora_agent/administrative_log_facility').with_value('<SERVICE DEFAULT>')

Loading…
Cancel
Save