Add keepalivd vrrp parameters
Change-Id: I26ad5d41239b6e770e975dc6f78fc46a87803220 (cherry picked from commit8fd7b2e0ff
) (cherry picked from commitb659647dbd
)
This commit is contained in:
parent
cad740722f
commit
3de4adbe19
|
@ -92,6 +92,29 @@
|
|||
# (optional) Seconds to wait for a port to detach from an amphora.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*vrrp_advert_int*]
|
||||
# (optional) Amphora role and priority advertisement internal in seconds.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*vrrp_check_interval*]
|
||||
# (optional) VRRP health check script run interval in seconds.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*vrrp_fail_count*]
|
||||
# (optional) Number of successive failures before transition to a fail rate.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*vrrp_success_count*]
|
||||
# (optional) Number of consecutive successes before transition to a success rate.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*vrrp_garp_refresh_interval*]
|
||||
# (optional) Time in seconds between gratuitous ARP announcements from the MASTER.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*vrrp_garp_refresh_count*]
|
||||
# (optional) Number of gratuitous ARP announcements to make on each refresh interval.
|
||||
# Defaults to $::os_service_default
|
||||
class octavia::controller (
|
||||
$amp_flavor_id = '65',
|
||||
$amp_image_tag = $::os_service_default,
|
||||
|
@ -113,6 +136,12 @@ class octavia::controller (
|
|||
$connection_logging = $::os_service_default,
|
||||
$build_active_retries = $::os_service_default,
|
||||
$port_detach_timeout = $::os_service_default,
|
||||
$vrrp_advert_int = $::os_service_default,
|
||||
$vrrp_check_interval = $::os_service_default,
|
||||
$vrrp_fail_count = $::os_service_default,
|
||||
$vrrp_success_count = $::os_service_default,
|
||||
$vrrp_garp_refresh_interval = $::os_service_default,
|
||||
$vrrp_garp_refresh_count = $::os_service_default,
|
||||
) inherits octavia::params {
|
||||
|
||||
include ::octavia::deps
|
||||
|
@ -165,5 +194,11 @@ class octavia::controller (
|
|||
'haproxy_amphora/connection_logging' : value => $connection_logging;
|
||||
'haproxy_amphora/build_active_retries' : value => $build_active_retries;
|
||||
'networking/port_detach_timeout' : value => $port_detach_timeout;
|
||||
'keepalived_vrrp/vrrp_advert_int' : value => $vrrp_advert_int;
|
||||
'keepalived_vrrp/vrrp_check_interval' : value => $vrrp_check_interval;
|
||||
'keepalived_vrrp/vrrp_fail_count' : value => $vrrp_fail_count;
|
||||
'keepalived_vrrp/vrrp_success_count' : value => $vrrp_success_count;
|
||||
'keepalived_vrrp/vrrp_garp_refresh_interval' : value => $vrrp_garp_refresh_interval;
|
||||
'keepalived_vrrp/vrrp_garp_refresh_count' : value => $vrrp_garp_refresh_count;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
features:
|
||||
- Added Keepalived VRRP parameters.
|
|
@ -24,7 +24,13 @@ describe 'octavia::controller' do
|
|||
:connection_retry_interval => 10,
|
||||
:connection_logging => false,
|
||||
:build_active_retries => 5,
|
||||
:port_detach_timeout => 15
|
||||
:port_detach_timeout => 15,
|
||||
:vrrp_advert_int => 1,
|
||||
:vrrp_check_interval => 5,
|
||||
:vrrp_fail_count => 2,
|
||||
:vrrp_success_count => 2,
|
||||
:vrrp_garp_refresh_interval => 5,
|
||||
:vrrp_garp_refresh_count => 2
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -40,6 +46,12 @@ describe 'octavia::controller' do
|
|||
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) }
|
||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_advert_int').with_value(1) }
|
||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_check_interval').with_value(5) }
|
||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_fail_count').with_value(2) }
|
||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_success_count').with_value(2) }
|
||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_interval').with_value(5) }
|
||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value(2) }
|
||||
end
|
||||
|
||||
it 'configures worker parameters' do
|
||||
|
@ -57,6 +69,12 @@ 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_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('keepalived_vrrp/vrrp_advert_int').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_check_interval').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_fail_count').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_success_count').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_interval').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
context 'with ssh key access disabled' do
|
||||
|
|
Loading…
Reference in New Issue