openstack
/
puppet-octavia
Code Issues Proposed changes

Merge "Support [amphora_agent] agent_tls_protocol"

This commit is contained in:
Zuul 2022-05-31 15:17:59 +00:00 committed by Gerrit Code Review
parent c6a1b96d0a eabf0a2f5d
commit c13c3ba6e7
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/controller.pp
View File

@ -151,6 +151,10 @@
# run before terminating the socket.
# Defaults to $::os_service_default
#
# [*agent_tls_protocol*]
# (optional) Minimum TLS protocol for communication with the amphora agent.
# Defaults to $::os_service_default
#
# [*admin_log_targets*]
# (optional) The list of syslog endpoints, host:port comma separated list,
# to receive administrative log messages.
@ -250,6 +254,7 @@ class octavia::controller (
$build_retry_interval = $::os_service_default,
$default_connection_limit = $::os_service_default,
$agent_request_read_timeout = $::os_service_default,
$agent_tls_protocol = $::os_service_default,
$admin_log_targets = $::os_service_default,
$administrative_log_facility = $::os_service_default,
$forward_all_logs = $::os_service_default,
@ -320,6 +325,7 @@ Use the octavia::networking class instead')
'haproxy_amphora/build_retry_interval' : value => $build_retry_interval;
'haproxy_amphora/default_connection_limit' : value => $default_connection_limit;
'amphora_agent/agent_request_read_timeout' : value => $agent_request_read_timeout;
'amphora_agent/agent_tls_protocol' : value => $agent_tls_protocol;
'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;

6
releasenotes/notes/agent_tls_protocol-6d161f6c693ca090.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The new ``octavia::controller::agent_tls_protocol`` parameter has been
added. This parameter controls the [amphora_agent] agent_tls_protocol``
option in octavia.conf.

3
spec/classes/octavia_controller_spec.rb
View File

@ -45,6 +45,7 @@ describe 'octavia::controller' do
:default_connection_limit => 50000,
:port_detach_timeout => 15,
:agent_request_read_timeout => 180,
:agent_tls_protocol => 'TLSv1.2',
:admin_log_targets => ['192.0.2.1:10514', '2001:db8:1::10:10514'],
:administrative_log_facility => 2,
:forward_all_logs => true,
@ -94,6 +95,7 @@ describe 'octavia::controller' do
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/agent_request_read_timeout').with_value(180)
is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').with_value('TLSv1.2')
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)
is_expected.to contain_octavia_config('amphora_agent/forward_all_logs').with_value(true)
@ -144,6 +146,7 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').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/agent_request_read_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').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>')
is_expected.to contain_octavia_config('amphora_agent/forward_all_logs').with_value('<SERVICE DEFAULT>')