From 604dced76bc076f2bf2014831a7480bb32884f0c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 12 Aug 2025 00:13:28 +0900 Subject: [PATCH] Adjust service config file for networking-l2gw ... according to the change made by [1]. [1] https://review.opendev.org/c/x/networking-l2gw/+/951422 Change-Id: I3aa562f3ca5371637155d3dca13fb0fab929bdce Depends-on: https://review.opendev.org/957032 Signed-off-by: Takashi Kajinami --- .../provider/neutron_l2gw_service_config/openstackconfig.rb | 2 +- lib/puppet/type/neutron_l2gw_service_config.rb | 2 +- manifests/config.pp | 2 +- spec/acceptance/99_neutron_config_spec.rb | 4 ++-- spec/classes/neutron_agents_l2gw_spec.rb | 2 +- spec/classes/neutron_services_l2gw_spec.rb | 6 +++--- .../neutron_l2gw_service_config/openstackconfig_spec.rb | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb b/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb index fc2562ee0..d49b867aa 100644 --- a/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb +++ b/lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb @@ -4,7 +4,7 @@ Puppet::Type.type(:neutron_l2gw_service_config).provide( ) do def self.file_path - '/etc/neutron/l2gw_plugin.ini' + '/etc/neutron/networking_l2gw.conf' end end diff --git a/lib/puppet/type/neutron_l2gw_service_config.rb b/lib/puppet/type/neutron_l2gw_service_config.rb index 069f37b3e..c2d2df000 100644 --- a/lib/puppet/type/neutron_l2gw_service_config.rb +++ b/lib/puppet/type/neutron_l2gw_service_config.rb @@ -3,7 +3,7 @@ Puppet::Type.newtype(:neutron_l2gw_service_config) do ensurable newparam(:name, :namevar => true) do - desc 'Section/setting name to manage from l2gw_plugin.ini' + desc 'Section/setting name to manage from networking_l2gw.conf' newvalues(/\S+\/\S+/) end diff --git a/manifests/config.pp b/manifests/config.pp index af24b49fe..e90c82707 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -52,7 +52,7 @@ # (optional) Manage configuration of l2gateway_agent.ini # # [*l2gw_service_config*] -# (optional) Manage configuration of l2gw_plugin.ini +# (optional) Manage configuration of networking_l2gw.conf # # [*sfc_service_config*] # (optional) Manage configuration of networking-sfc.conf diff --git a/spec/acceptance/99_neutron_config_spec.rb b/spec/acceptance/99_neutron_config_spec.rb index 9ed7bb245..22e41bf35 100644 --- a/spec/acceptance/99_neutron_config_spec.rb +++ b/spec/acceptance/99_neutron_config_spec.rb @@ -8,7 +8,7 @@ describe 'basic neutron_config resource' do '/etc/neutron/l3_agent.ini', '/etc/neutron/metadata_agent.ini', '/etc/neutron/metering_agent.ini', - '/etc/neutron/l2gw_plugin.ini', + '/etc/neutron/networking_l2gw.conf', '/etc/neutron/l2gateway_agent.ini', '/etc/neutron/plugins/ml2/ml2_conf.ini', '/etc/neutron/vpn_agent.ini', @@ -52,7 +52,7 @@ describe 'basic neutron_config resource' do '/etc/neutron/l3_agent.ini', '/etc/neutron/metadata_agent.ini', '/etc/neutron/metering_agent.ini', - '/etc/neutron/l2gw_plugin.ini', + '/etc/neutron/networking_l2gw.conf', '/etc/neutron/l2gateway_agent.ini', '/etc/neutron/plugins/ml2/ml2_conf.ini', '/etc/neutron/vpn_agent.ini', diff --git a/spec/classes/neutron_agents_l2gw_spec.rb b/spec/classes/neutron_agents_l2gw_spec.rb index eeb2c9f00..3610fd2c4 100644 --- a/spec/classes/neutron_agents_l2gw_spec.rb +++ b/spec/classes/neutron_agents_l2gw_spec.rb @@ -49,7 +49,7 @@ describe 'neutron::agents::l2gw' do ) end - it 'configures l2gw_plugin.ini' do + it 'configures networking_l2gw.conf' do should contain_neutron_l2gw_agent_config('DEFAULT/debug').with_value('') should contain_neutron_l2gw_agent_config('ovsdb/enable_manager').with_value(p[:enable_manager]) should contain_neutron_l2gw_agent_config('ovsdb/manager_table_listening_port').with_value(p[:manager_table_listening_port]) diff --git a/spec/classes/neutron_services_l2gw_spec.rb b/spec/classes/neutron_services_l2gw_spec.rb index f0386f585..f53f6d77b 100644 --- a/spec/classes/neutron_services_l2gw_spec.rb +++ b/spec/classes/neutron_services_l2gw_spec.rb @@ -31,7 +31,7 @@ describe 'neutron::services::l2gw' do ) end - it 'configures l2gw_plugin.ini' do + it 'configures networking_l2gw.conf' do should contain_neutron_l2gw_service_config('DEFAULT/default_interface_name').with_value('') should contain_neutron_l2gw_service_config('DEFAULT/default_device_name').with_value('') should contain_neutron_l2gw_service_config('DEFAULT/quota_l2_gateway').with_value('') @@ -60,7 +60,7 @@ describe 'neutron::services::l2gw' do }) end - it 'configures l2gw_plugin.ini' do + it 'configures networking_l2gw.conf' do should contain_neutron_l2gw_service_config('DEFAULT/default_interface_name').with_value('foo') end end @@ -94,7 +94,7 @@ describe 'neutron::services::l2gw' do } end - it 'configures multiple service providers in l2gw_plugin.ini' do + it 'configures multiple service providers in networking_l2gw.conf' do should contain_neutron_l2gw_service_config( 'service_providers/service_provider' ).with_value(['provider1', 'provider2']) diff --git a/spec/unit/provider/neutron_l2gw_service_config/openstackconfig_spec.rb b/spec/unit/provider/neutron_l2gw_service_config/openstackconfig_spec.rb index 1a2f57952..5b52ffe12 100644 --- a/spec/unit/provider/neutron_l2gw_service_config/openstackconfig_spec.rb +++ b/spec/unit/provider/neutron_l2gw_service_config/openstackconfig_spec.rb @@ -14,7 +14,7 @@ describe provider_class do provider = provider_class.new(resource) expect(provider.section).to eq('DEFAULT') expect(provider.setting).to eq('foo') - expect(provider.file_path).to eq('/etc/neutron/l2gw_plugin.ini') + expect(provider.file_path).to eq('/etc/neutron/networking_l2gw.conf') end it 'should allow setting to be set explicitly' do @@ -27,7 +27,7 @@ describe provider_class do provider = provider_class.new(resource) expect(provider.section).to eq('dude') expect(provider.setting).to eq('foo') - expect(provider.file_path).to eq('/etc/neutron/l2gw_plugin.ini') + expect(provider.file_path).to eq('/etc/neutron/networking_l2gw.conf') end it 'should ensure absent when is specified as a value' do