openstack
/
puppet-octavia
Code Issues Proposed changes

Add the "connection_logging" parameter 

The connection_logging parameter allows you to disable connection
flow logging.

Change-Id: Iaac3675a9c34e0c30ea925a7fc74edcfdf1d10df
(cherry picked from commit 20df1ec879)
This commit is contained in:
Michael Johnson 2019-09-20 12:44:13 -07:00 committed by Carlos Goncalves
parent 3acf4ef0ef
commit a44decf5ba
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/controller.pp
View File

@ -62,6 +62,12 @@
# (optional) Number of seconds to wait between connection attempts to amphora.
# Defaults to $::os_service_default
#
# [*connection_logging*]
# (optional) When false, disables logging of tenant connection flows. This
# includes storing them locally and sending them to the tenant syslog
# endpoints.
# 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
@ -84,6 +90,7 @@ class octavia::controller (
$controller_ip_port_list = $::os_service_default,
$connection_max_retries = $::os_service_default,
$connection_retry_interval = $::os_service_default,
$connection_logging = $::os_service_default,
$build_active_retries = $::os_service_default,
$port_detach_timeout = $::os_service_default,
) inherits octavia::params {
@ -127,6 +134,7 @@ class octavia::controller (
'health_manager/controller_ip_port_list' : value => $controller_ip_port_list;
'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_active_retries' : value => $build_active_retries;
'networking/port_detach_timeout' : value => $port_detach_timeout;
}

3
releasenotes/notes/add-connection-logging-parameter-d92bc438db6f51bb.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Added the "connection_logging" parameter.

3
spec/classes/octavia_controller_spec.rb
View File

@ -22,6 +22,7 @@ describe 'octavia::controller' do
:controller_ip_port_list => '1.2.3.4:5555,4.3.2.1:5555',
:connection_max_retries => 240,
:connection_retry_interval => 10,
:connection_logging => false,
:build_active_retries => 5,
:port_detach_timeout => 15
}
@ -36,6 +37,7 @@ describe 'octavia::controller' do
it { is_expected.to contain_octavia_config('health_manager/controller_ip_port_list').with_value('1.2.3.4:5555,4.3.2.1:5555') }
it { is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value(240) }
it { is_expected.to contain_octavia_config('haproxy_amphora/connection_retry_interval').with_value(10) }
it { is_expected.to contain_octavia_config('haproxy_amphora/connection_logging').with_value(false) }
it { is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value(5) }
it { is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15) }
end
@ -48,6 +50,7 @@ describe 'octavia::controller' do
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/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_active_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value('<SERVICE DEFAULT>')
end