Add the "connection_logging" parameter
The connection_logging parameter allows you to disable connection flow logging. Change-Id: Iaac3675a9c34e0c30ea925a7fc74edcfdf1d10df
This commit is contained in:
@@ -78,6 +78,12 @@
|
|||||||
# (optional) Number of seconds to wait between connection attempts to amphora.
|
# (optional) Number of seconds to wait between connection attempts to amphora.
|
||||||
# Defaults to $::os_service_default
|
# 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*]
|
# [*build_active_retries*]
|
||||||
# (optional) Retry threshold for waiting for a build slot for an amphorae.
|
# (optional) Retry threshold for waiting for a build slot for an amphorae.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
@@ -104,6 +110,7 @@ class octavia::controller (
|
|||||||
$controller_ip_port_list = $::os_service_default,
|
$controller_ip_port_list = $::os_service_default,
|
||||||
$connection_max_retries = $::os_service_default,
|
$connection_max_retries = $::os_service_default,
|
||||||
$connection_retry_interval = $::os_service_default,
|
$connection_retry_interval = $::os_service_default,
|
||||||
|
$connection_logging = $::os_service_default,
|
||||||
$build_active_retries = $::os_service_default,
|
$build_active_retries = $::os_service_default,
|
||||||
$port_detach_timeout = $::os_service_default,
|
$port_detach_timeout = $::os_service_default,
|
||||||
) inherits octavia::params {
|
) inherits octavia::params {
|
||||||
@@ -155,6 +162,7 @@ class octavia::controller (
|
|||||||
'health_manager/controller_ip_port_list' : value => $controller_ip_port_list;
|
'health_manager/controller_ip_port_list' : value => $controller_ip_port_list;
|
||||||
'haproxy_amphora/connection_max_retries' : value => $connection_max_retries;
|
'haproxy_amphora/connection_max_retries' : value => $connection_max_retries;
|
||||||
'haproxy_amphora/connection_retry_interval' : value => $connection_retry_interval;
|
'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;
|
'haproxy_amphora/build_active_retries' : value => $build_active_retries;
|
||||||
'networking/port_detach_timeout' : value => $port_detach_timeout;
|
'networking/port_detach_timeout' : value => $port_detach_timeout;
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- Added the "connection_logging" parameter.
|
@@ -22,6 +22,7 @@ describe 'octavia::controller' do
|
|||||||
:controller_ip_port_list => '1.2.3.4:5555,4.3.2.1:5555',
|
:controller_ip_port_list => '1.2.3.4:5555,4.3.2.1:5555',
|
||||||
:connection_max_retries => 240,
|
:connection_max_retries => 240,
|
||||||
:connection_retry_interval => 10,
|
:connection_retry_interval => 10,
|
||||||
|
:connection_logging => false,
|
||||||
:build_active_retries => 5,
|
:build_active_retries => 5,
|
||||||
:port_detach_timeout => 15
|
: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('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_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_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('haproxy_amphora/build_active_retries').with_value(5) }
|
||||||
it { is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15) }
|
it { is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15) }
|
||||||
end
|
end
|
||||||
@@ -52,6 +54,7 @@ describe 'octavia::controller' do
|
|||||||
is_expected.to contain_octavia_config('haproxy_amphora/timeout_tcp_inspect').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('haproxy_amphora/timeout_tcp_inspect').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('haproxy_amphora/connection_max_retries').with_value('<SERVICE DEFAULT>')
|
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_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('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('networking/port_detach_timeout').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user