openstack/puppet-octavia
Code Issues Proposed changes

Merge "Clean up deprecated controller class parameter"

Browse Source
This commit is contained in:
Zuul 2023-01-17 04:51:57 +00:00 committed by Gerrit Code Review
commit 241d341c8a
4 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/controller.pp
View File

@ -251,12 +251,6 @@
# (optional) Sleep time between sending heartbeats.
# Defaults to undef
#
# DEPRECATED PARAMETERS
#
# [*port_detach_timeout*]
# (optional) Seconds to wait for a port to detach from an amphora.
# Defaults to undef
#
class octavia::controller (
$heartbeat_key,
$amp_active_retries = $::os_service_default,
@ -314,8 +308,6 @@ class octavia::controller (
$vrrp_garp_refresh_count = $::os_service_default,
$controller_ip_port_list = $::os_service_default,
$heartbeat_interval = $::os_service_default,
# DEPRECATED PARAMETERS
$port_detach_timeout = undef,
) inherits octavia::params {
include octavia::deps
@ -323,12 +315,6 @@ class octavia::controller (
validate_legacy(String, 'validate_string', $heartbeat_key)
if $port_detach_timeout != undef {
warning('The octavia::controller::port_detach_timeout parameter is deprecated. \
Use the octavia::networking class instead')
}
include octavia::networking
if ! is_service_default($loadbalancer_topology) and
! ($loadbalancer_topology in ['SINGLE', 'ACTIVE_STANDBY']) {
fail('load balancer topology must be one of SINGLE or ACTIVE_STANDBY')

4
manifests/networking.pp
View File

@ -68,14 +68,12 @@ class octavia::networking (
include octavia::deps
$port_detach_timeout_real = pick($::octavia::controller::port_detach_timeout, $port_detach_timeout)
octavia_config {
'networking/max_retries': value => $max_retries;
'networking/retry_interval': value => $retry_interval;
'networking/retry_backoff': value => $retry_backoff;
'networking/retry_max': value => $retry_max;
'networking/port_detach_timeout': value => $port_detach_timeout_real;
'networking/port_detach_timeout': value => $port_detach_timeout;
'networking/allow_vip_network_id': value => $allow_vip_network_id;
'networking/allow_vip_subnet_id': value => $allow_vip_subnet_id;
'networking/allow_vip_port_id': value => $allow_vip_port_id;

5
releasenotes/notes/networking-cleanup-26b95cf9d6d51487.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The ``octavia::controller::port_detach_timeout`` parameter has been
removed.

3
spec/classes/octavia_controller_spec.rb
View File

@ -51,7 +51,6 @@ describe 'octavia::controller' do
:build_active_retries => 120,
:build_retry_interval => 5,
:default_connection_limit => 50000,
:port_detach_timeout => 15,
:agent_request_read_timeout => 180,
:agent_tls_protocol => 'TLSv1.2',
:admin_log_targets => ['192.0.2.1:10514', '2001:db8:1::10:10514'],
@ -109,7 +108,6 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value(120)
is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value(5)
is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value(50000)
is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value(15)
is_expected.to contain_octavia_config('amphora_agent/agent_request_read_timeout').with_value(180)
is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').with_value('TLSv1.2')
is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('192.0.2.1:10514,2001:db8:1::10:10514')
@ -173,7 +171,6 @@ describe 'octavia::controller' do
is_expected.to contain_octavia_config('haproxy_amphora/build_active_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/build_retry_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('haproxy_amphora/default_connection_limit').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('networking/port_detach_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('amphora_agent/agent_request_read_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('amphora_agent/agent_tls_protocol').with_value('<SERVICE DEFAULT>')
is_expected.to contain_octavia_config('amphora_agent/admin_log_targets').with_value('<SERVICE DEFAULT>')