openstack/puppet-neutron
Code Issues Proposed changes

Merge "Adjust service config file for networking-l2gw"

Browse Source
This commit is contained in:
Zuul
2025-09-08 21:44:42 +00:00
committed by Gerrit Code Review
parent fb59d84832 604dced76b
commit 0355a8a967
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/puppet/provider/neutron_l2gw_service_config/openstackconfig.rb
View File

@@ -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

2
lib/puppet/type/neutron_l2gw_service_config.rb
View File

@@ -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

2
manifests/config.pp
View File

@@ -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

4
spec/acceptance/99_neutron_config_spec.rb
View File

@@ -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/fwaas_driver.ini',
@@ -56,7 +56,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/fwaas_driver.ini',

2
spec/classes/neutron_agents_l2gw_spec.rb
View File

@@ -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('<SERVICE DEFAULT>')
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])

6
spec/classes/neutron_services_l2gw_spec.rb
View File

@@ -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('<SERVICE DEFAULT>')
should contain_neutron_l2gw_service_config('DEFAULT/default_device_name').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_service_config('DEFAULT/quota_l2_gateway').with_value('<SERVICE DEFAULT>')
@@ -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'])

4
spec/unit/provider/neutron_l2gw_service_config/openstackconfig_spec.rb
View File

@@ -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 <SERVICE DEFAULT> is specified as a value' do