Revert "Add parameters for amphora anti-affinity"
This reverts commit 280af2381d
.
Change-Id: I86ee99d57c41137a25e9ce6387ef7d1dd546b633
This commit is contained in:
parent
280af2381d
commit
f01d673ffe
|
@ -99,15 +99,6 @@
|
||||||
# [*vrrp_garp_refresh_count*]
|
# [*vrrp_garp_refresh_count*]
|
||||||
# (optional) Number of gratuitous ARP announcements to make on each refresh interval.
|
# (optional) Number of gratuitous ARP announcements to make on each refresh interval.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
|
||||||
# [*enable_anti_affinity*]
|
|
||||||
# (optional) Flag to indicate if octavia anti-affinity feature is turned on.
|
|
||||||
# Defaults to $::os_service_default
|
|
||||||
#
|
|
||||||
# [*anti_affinity_policy*]
|
|
||||||
# (optional) Sets the nova anti-affinity policy for octavia.
|
|
||||||
# Defaults to $::os_service_default
|
|
||||||
|
|
||||||
class octavia::controller (
|
class octavia::controller (
|
||||||
$amp_flavor_id = '65',
|
$amp_flavor_id = '65',
|
||||||
$amp_image_tag = $::os_service_default,
|
$amp_image_tag = $::os_service_default,
|
||||||
|
@ -131,8 +122,6 @@ class octavia::controller (
|
||||||
$vrrp_success_count = $::os_service_default,
|
$vrrp_success_count = $::os_service_default,
|
||||||
$vrrp_garp_refresh_interval = $::os_service_default,
|
$vrrp_garp_refresh_interval = $::os_service_default,
|
||||||
$vrrp_garp_refresh_count = $::os_service_default,
|
$vrrp_garp_refresh_count = $::os_service_default,
|
||||||
$enable_anti_affinity = $::os_service_default,
|
|
||||||
$anti_affinity_policy = $::os_service_default,
|
|
||||||
) inherits octavia::params {
|
) inherits octavia::params {
|
||||||
|
|
||||||
include ::octavia::deps
|
include ::octavia::deps
|
||||||
|
@ -183,7 +172,5 @@ class octavia::controller (
|
||||||
'keepalived_vrrp/vrrp_success_count' : value => $vrrp_success_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_interval' : value => $vrrp_garp_refresh_interval;
|
||||||
'keepalived_vrrp/vrrp_garp_refresh_count' : value => $vrrp_garp_refresh_count;
|
'keepalived_vrrp/vrrp_garp_refresh_count' : value => $vrrp_garp_refresh_count;
|
||||||
'nova/enable_anti_affinity' : value => $enable_anti_affinity;
|
|
||||||
'nova/anti_affinity_policy' : value => $anti_affinity_policy;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
---
|
|
||||||
features:
|
|
||||||
- |
|
|
||||||
Add parameters to enable and configure nova anti-affinity for
|
|
||||||
active/standby amphorae.
|
|
|
@ -30,9 +30,7 @@ describe 'octavia::controller' do
|
||||||
:vrrp_fail_count => 2,
|
:vrrp_fail_count => 2,
|
||||||
:vrrp_success_count => 2,
|
:vrrp_success_count => 2,
|
||||||
:vrrp_garp_refresh_interval => 5,
|
:vrrp_garp_refresh_interval => 5,
|
||||||
:vrrp_garp_refresh_count => 2,
|
:vrrp_garp_refresh_count => 2
|
||||||
:enable_anti_affinity => true,
|
|
||||||
:anti_affinity_policy => 'anti-affinity',
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -54,8 +52,6 @@ describe 'octavia::controller' do
|
||||||
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_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_interval').with_value(5) }
|
||||||
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value(2) }
|
it { is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value(2) }
|
||||||
it { is_expected.to contain_octavia_config('nova/enable_anti_affinity').with_value(true) }
|
|
||||||
it { is_expected.to contain_octavia_config('nova/anti_affinity_policy').with_value('anti-affinity') }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'configures worker parameters' do
|
it 'configures worker parameters' do
|
||||||
|
@ -75,8 +71,6 @@ describe 'octavia::controller' do
|
||||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_success_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_interval').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_octavia_config('keepalived_vrrp/vrrp_garp_refresh_count').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_octavia_config('nova/enable_anti_affinity').with_value('<SERVICE DEFAULT>')
|
|
||||||
is_expected.to contain_octavia_config('nova/anti_affinity_policy').with_value('<SERVICE DEFAULT>')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with ssh key access disabled' do
|
context 'with ssh key access disabled' do
|
||||||
|
|
Loading…
Reference in New Issue