openstack/puppet-neutron
Code Issues Proposed changes

l2gw: Drop redundant hard-coded default values

Browse Source 
These match the default values in networking-l2gw so can be replaced
by the os_service_default fact.

Change-Id: I863676e852383724ed7268ee13e32968f23523d0
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-09-13 21:44:50 +09:00
parent 0355a8a967
commit ad054040db
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/agents/l2gw.pp
View File

@@ -27,41 +27,36 @@
# #
# [*enable_manager*] # [*enable_manager*]
# (optional) connection can be initiated by the ovsdb server. # (optional) connection can be initiated by the ovsdb server.
# Defaults to false # Defaults to $facts['os_service_default']
# #
# [*manager_table_listening_port*] # [*manager_table_listening_port*]
# (optional) set port number for l2gateway agent, so that it can listen # (optional) set port number for l2gateway agent, so that it can listen
# Defaults to '6632' # Defaults to $facts['os_service_default']
# #
# [*l2_gw_agent_priv_key_base_path*] # [*l2_gw_agent_priv_key_base_path*]
# (optional) Base path to private key file(s). # (optional) Base path to private key file(s).
# Example: l2_gw_agent_priv_key_base_path = '/home/someuser/keys'
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*l2_gw_agent_cert_base_path*] # [*l2_gw_agent_cert_base_path*]
# (optional) Base path to cert file(s). # (optional) Base path to cert file(s).
# Example: l2_gw_agent_cert_base_path = '/home/someuser/certs'
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*l2_gw_agent_ca_cert_base_path*] # [*l2_gw_agent_ca_cert_base_path*]
# (optional) Base path to ca cert file(s). # (optional) Base path to ca cert file(s).
# Example: l2_gw_agent_ca_cert_base_path = '/home/someuser/ca_certs'
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*periodic_interval*] # [*periodic_interval*]
# (optional) The L2 gateway agent checks connection state with the OVSDB # (optional) The L2 gateway agent checks connection state with the OVSDB
# servers. The interval is number of seconds between attempts. # servers. The interval is number of seconds between attempts.
# Example: periodic_interval = 20
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*max_connection_retries*] # [*max_connection_retries*]
# (optional) The L2 gateway agent retries to connect to the OVSDB server # (optional) The L2 gateway agent retries to connect to the OVSDB server
# Example: max_connection_retries = 10
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# [*socket_timeout*] # [*socket_timeout*]
# (optional) socket timeout # (optional) socket timeout
# Defaults to '30' # Defaults to 30
# #
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
@@ -74,14 +69,14 @@ class neutron::agents::l2gw (
Boolean $manage_service = true, Boolean $manage_service = true,
$debug = $facts['os_service_default'], $debug = $facts['os_service_default'],
$ovsdb_hosts = $facts['os_service_default'], $ovsdb_hosts = $facts['os_service_default'],
$enable_manager = false, $enable_manager = $facts['os_service_default'],
$manager_table_listening_port = '6632', $manager_table_listening_port = $facts['os_service_default'],
$l2_gw_agent_priv_key_base_path = $facts['os_service_default'], $l2_gw_agent_priv_key_base_path = $facts['os_service_default'],
$l2_gw_agent_cert_base_path = $facts['os_service_default'], $l2_gw_agent_cert_base_path = $facts['os_service_default'],
$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 = 30,
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {
include neutron::deps include neutron::deps

14
spec/classes/neutron_agents_l2gw_spec.rb
View File

@@ -18,12 +18,10 @@ 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, :purge_config => false,
:enabled => true, :enabled => true,
:enable_manager => false, :socket_timeout => '30',
:manager_table_listening_port => '6632',
:socket_timeout => '30',
} }
end end
@@ -51,8 +49,8 @@ describe 'neutron::agents::l2gw' do
it 'configures networking_l2gw.conf' do it 'configures networking_l2gw.conf' do
should contain_neutron_l2gw_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/enable_manager').with_value(p[:enable_manager]) should contain_neutron_l2gw_agent_config('ovsdb/enable_manager').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/manager_table_listening_port').with_value(p[:manager_table_listening_port]) should contain_neutron_l2gw_agent_config('ovsdb/manager_table_listening_port').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_priv_key_base_path').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_priv_key_base_path').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_cert_base_path').with_value('<SERVICE DEFAULT>') should contain_neutron_l2gw_agent_config('ovsdb/l2_gw_agent_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/l2_gw_agent_ca_cert_base_path').with_value('<SERVICE DEFAULT>')