openstack/puppet-neutron
Code Issues Proposed changes

Drop redundant defaults of state_path

Browse Source 
These exactly match the service default value.

Change-Id: I652adf06d4dfca3fcd79c1c2d8113c3b0b9b22e5
This commit is contained in:
Takashi Kajinami 2024-09-15 22:44:22 +09:00
parent 28d16299c0
commit 38d49a4b6e
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/agents/dhcp.pp
View File

@ -20,7 +20,8 @@
# #
# [*state_path*] # [*state_path*]
# (optional) Where to store dnsmasq state files. This directory must be # (optional) Where to store dnsmasq state files. This directory must be
# writable by the user executing the agent. Defaults to '/var/lib/neutron'. # writable by the user executing the agent.
# Defaults to $facts['os_service_default'].
# #
# [*resync_interval*] # [*resync_interval*]
# (optional) The DHCP agent will resync its state with Neutron to recover # (optional) The DHCP agent will resync its state with Neutron to recover
@ -130,7 +131,7 @@ class neutron::agents::dhcp (
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$debug = $facts['os_service_default'], $debug = $facts['os_service_default'],
$state_path = '/var/lib/neutron', $state_path = $facts['os_service_default'],
$resync_interval = $facts['os_service_default'], $resync_interval = $facts['os_service_default'],
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$dhcp_driver = $facts['os_service_default'], $dhcp_driver = $facts['os_service_default'],

4
manifests/agents/ml2/ovn.pp
View File

@ -97,7 +97,7 @@
# [*state_path*] # [*state_path*]
# (optional) Where to store state files. This directory must be writable # (optional) Where to store state files. This directory must be writable
# by the user executing the agent # by the user executing the agent
# Defaults to '/var/lib/neutron'. # 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
@ -126,7 +126,7 @@ class neutron::agents::ml2::ovn (
$ovsdb_probe_interval = $facts['os_service_default'], $ovsdb_probe_interval = $facts['os_service_default'],
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$root_helper_daemon = $facts['os_service_default'], $root_helper_daemon = $facts['os_service_default'],
$state_path = '/var/lib/neutron', $state_path = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {

4
manifests/agents/ovn_metadata.pp
View File

@ -112,7 +112,7 @@
# [*state_path*] # [*state_path*]
# (optional) Where to store state files. This directory must be writable # (optional) Where to store state files. This directory must be writable
# by the user executing the agent # by the user executing the agent
# Defaults to: '/var/lib/neutron'. # 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
@ -145,7 +145,7 @@ class neutron::agents::ovn_metadata (
$ovsdb_probe_interval = $facts['os_service_default'], $ovsdb_probe_interval = $facts['os_service_default'],
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$root_helper_daemon = $facts['os_service_default'], $root_helper_daemon = $facts['os_service_default'],
$state_path = '/var/lib/neutron', $state_path = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
) { ) {

3
spec/classes/neutron_agents_dhcp_spec.rb
View File

@ -13,7 +13,6 @@ describe 'neutron::agents::dhcp' do
{ {
:package_ensure => 'present', :package_ensure => 'present',
:enabled => true, :enabled => true,
:state_path => '/var/lib/neutron',
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver', :interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', :root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:enable_isolated_metadata => false, :enable_isolated_metadata => false,
@ -32,7 +31,7 @@ describe 'neutron::agents::dhcp' do
it 'configures dhcp_agent.ini' do it 'configures dhcp_agent.ini' do
should contain_neutron_dhcp_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/state_path').with_value(p[:state_path]); should contain_neutron_dhcp_agent_config('DEFAULT/state_path').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value('<SERVICE DEFAULT>');
should contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]); should contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value('<SERVICE DEFAULT>'); should contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value('<SERVICE DEFAULT>');

2
spec/classes/neutron_agents_ml2_ovn_spec.rb
View File

@ -37,7 +37,7 @@ describe 'neutron::agents::ml2::ovn' do
it 'configures ovn_agent.ini' do it 'configures ovn_agent.ini' do
should contain_neutron_agent_ovn('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('DEFAULT/state_path').with(:value => '/var/lib/neutron') should contain_neutron_agent_ovn('DEFAULT/state_path').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('agent/extensions').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('agent/extensions').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('agent/root_helper').with(:value => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf') should contain_neutron_agent_ovn('agent/root_helper').with(:value => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf')
should contain_neutron_agent_ovn('agent/root_helper_daemon').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('agent/root_helper_daemon').with(:value => '<SERVICE DEFAULT>')

2
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@ -52,7 +52,7 @@ describe 'neutron::agents::ovn_metadata' do
should contain_ovn_metadata_agent_config('DEFAULT/metadata_workers').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/metadata_workers').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/metadata_backlog').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/metadata_backlog').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_insecure').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('DEFAULT/nova_metadata_insecure').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/state_path').with(:value => '/var/lib/neutron') should contain_ovn_metadata_agent_config('DEFAULT/state_path').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('DEFAULT/metadata_proxy_shared_secret').with(:value => params[:shared_secret]).with_secret(true) should contain_ovn_metadata_agent_config('DEFAULT/metadata_proxy_shared_secret').with(:value => params[:shared_secret]).with_secret(true)
should contain_ovn_metadata_agent_config('agent/root_helper').with(:value => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf') should contain_ovn_metadata_agent_config('agent/root_helper').with(:value => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf')
should contain_ovn_metadata_agent_config('agent/root_helper_daemon').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('agent/root_helper_daemon').with(:value => '<SERVICE DEFAULT>')