openstack
/
puppet-octavia
Code Issues Proposed changes

Revert "Add parameters for amphora anti-affinity" 

This reverts commit 0eaf41481b.

Change-Id: I25d051efdfb85bb0a45a66123d482c9622b0d885
This commit is contained in:
Tobias Urdin 2019-12-14 15:28:24 +00:00
parent 0eaf41481b
commit 736f28623a
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/controller.pp
View File

@ -151,14 +151,6 @@
# This includes all kernel, system, and security logs.
# 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 (
$amp_flavor_id = '65',
$amp_image_tag = $::os_service_default,
@ -193,8 +185,6 @@ class octavia::controller (
$user_log_facility = $::os_service_default,
$user_log_format = $::os_service_default,
$disable_local_log_storage = $::os_service_default,
$enable_anti_affinity = $::os_service_default,
$anti_affinity_policy = $::os_service_default,
) inherits octavia::params {
include ::octavia::deps
@ -260,7 +250,5 @@ class octavia::controller (
'amphora_agent/user_log_facility' : value => $user_log_facility;
'haproxy_amphora/user_log_format' : value => $user_log_format;
'amphora_agent/disable_local_log_storage' : value => $disable_local_log_storage;
'nova/enable_anti_affinity' : value => $enable_anti_affinity;
'nova/anti_affinity_policy' : value => $anti_affinity_policy;
}
}

5
releasenotes/notes/add-anti-affinity-0f80e4ac5fd4bde6.yaml
View File

@ -1,5 +0,0 @@
---
features:
- |
Add parameters to enable and configure nova anti-affinity for
active/standby amphorae.

6
spec/classes/octavia_controller_spec.rb
View File

@ -38,8 +38,6 @@ describe 'octavia::controller' do
:user_log_facility => 3,
:user_log_format => '{{ project_id }} {{ lb_id }}',
:disable_local_log_storage => true,
:enable_anti_affinity => true,
:anti_affinity_policy => 'anti-affinity'
}
end
@ -68,8 +66,6 @@ describe 'octavia::controller' do
it { is_expected.to contain_octavia_config('amphora_agent/user_log_facility').with_value(3) }
it { is_expected.to contain_octavia_config('haproxy_amphora/user_log_format').with_value('{{ project_id }} {{ lb_id }}') }
it { is_expected.to contain_octavia_config('amphora_agent/disable_local_log_storage').with_value(true) }
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
it 'configures worker parameters' do
@ -100,8 +96,6 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('amphora_agent/user_log_facility').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/user_log_format').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('amphora_agent/disable_local_log_storage').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
context 'with ssh key access disabled' do