openstack/puppet-neutron
Code Issues Proposed changes

Merge "l2gw: Translate default service_provider"

Browse Source
This commit is contained in:
Zuul 2023-11-15 17:38:46 +00:00 committed by Gerrit Code Review
commit 3350eff34d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/services/l2gw.pp
View File

@ -71,7 +71,16 @@ class neutron::services::l2gw (
'DEFAULT/default_device_name': value => $default_device_name;
'DEFAULT/quota_l2_gateway': value => $quota_l2_gateway;
'DEFAULT/periodic_monitoring_interval': value => $periodic_monitoring_interval;
'service_providers/service_provider': value => $service_providers;
}
if is_service_default($service_providers) {
$service_providers_real = 'L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default'
} else {
$service_providers_real = $service_providers
}
neutron_l2gw_service_config {
'service_providers/service_provider': value => $service_providers_real;
}
if $sync_db {

5
spec/classes/neutron_services_l2gw_spec.rb
View File

@ -32,12 +32,13 @@ describe 'neutron::services::l2gw' do
end
it 'configures l2gw_plugin.ini' do
should contain_neutron_l2gw_service_config('service_providers/service_provider').with_value('<SERVICE DEFAULT>')
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>')
should contain_neutron_l2gw_service_config('DEFAULT/periodic_monitoring_interval').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_service_config('service_providers/service_provider').with_value('<SERVICE DEFAULT>')
should contain_neutron_l2gw_service_config('service_providers/service_provider').with_value(
'L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default'
)
end
it 'does not run neutron-db-manage' do