openstack/puppet-neutron
Code Issues Proposed changes

l2gw: Drop explicit override of socket_timeout

Browse Source 
... but leave it to users.

Change-Id: I5c5965c8614e531854b9a7da022e24af40049dfd
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-13 21:48:52 +09:00
parent ad054040db
commit 3e54f3fea7
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/l2gw.pp
View File

@@ -56,7 +56,7 @@
# #
# [*socket_timeout*] # [*socket_timeout*]
# (optional) socket timeout # (optional) socket timeout
# Defaults to 30 # Defaults to $facts['os_service_default']
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
@@ -76,7 +76,7 @@ class neutron::agents::l2gw (
$l2_gw_agent_ca_cert_base_path = $facts['os_service_default'], $l2_gw_agent_ca_cert_base_path = $facts['os_service_default'],
$periodic_interval = $facts['os_service_default'], $periodic_interval = $facts['os_service_default'],
$max_connection_retries = $facts['os_service_default'], $max_connection_retries = $facts['os_service_default'],
$socket_timeout = 30, $socket_timeout = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps

7
releasenotes/notes/l2gw-use-default-max_connection_retries-366d9f8b5b4bff1f.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
upgrade:
- |
The ``neutron::agents::l2gw::max_connection_retries`` parameter now
defaults to the ``os_service_default`` fact, which uses the internal
default value of the networking-l2gw plugin. Set this parameter in case
the previous default value ( ``30`` ) is desired.

4
spec/classes/neutron_agents_l2gw_spec.rb
View File

@@ -19,9 +19,7 @@ require 'spec_helper'
describe 'neutron::agents::l2gw' do describe 'neutron::agents::l2gw' do
let :default_params do let :default_params do
{ :package_ensure => 'present', { :package_ensure => 'present',
:purge_config => false,
:enabled => true, :enabled => true,
:socket_timeout => '30',
} }
end end
@@ -56,7 +54,7 @@ describe 'neutron::agents::l2gw' do
should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_ca_cert_base_path').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_ca_cert_base_path').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/periodic_interval').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('ovsdb/periodic_interval').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/max_connection_retries').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('ovsdb/max_connection_retries').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/socket_timeout').with_value(p[:socket_timeout]) should contain_neutron_l2gw_agent_config('ovsdb/socket_timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/ovsdb_hosts').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('ovsdb/ovsdb_hosts').with_value('<SERVICE DEFAULT>')
end end