openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Stop hardcoding l3_ha and max_l3_agents_per_router"

This commit is contained in:
Zuul 2023-03-22 16:40:42 +00:00 committed by Gerrit Code Review
parent 4b49f67bca 91cda5a5a0
commit 25f236e2bb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/server.pp
View File

@ -260,8 +260,8 @@ class neutron::server (
$default_availability_zones = $facts['os_service_default'],
$allow_automatic_l3agent_failover = $facts['os_service_default'],
$allow_automatic_dhcp_failover = $facts['os_service_default'],
$l3_ha = false,
$max_l3_agents_per_router = 3,
$l3_ha = $facts['os_service_default'],
$max_l3_agents_per_router = $facts['os_service_default'],
$l3_ha_net_cidr = $facts['os_service_default'],
$l3_ha_network_type = $facts['os_service_default'],
$l3_ha_network_physical_name = $facts['os_service_default'],

9
spec/classes/neutron_server_spec.rb
View File

@ -19,8 +19,6 @@ describe 'neutron::server' do
:auth_strategy => 'keystone',
:sync_db => false,
:router_scheduler_driver => 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler',
:l3_ha => false,
:max_l3_agents_per_router => 3,
}
end
@ -131,7 +129,10 @@ describe 'neutron::server' do
context 'with HA routers enabled' do
before :each do
params.merge!(:l3_ha => true)
params.merge!(
:l3_ha => true,
:max_l3_agents_per_router => 3,
)
end
it 'should enable HA routers' do
@ -150,7 +151,7 @@ describe 'neutron::server' do
it 'should disable HA routers' do
should contain_neutron_config('DEFAULT/l3_ha').with_value(false)
should contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value(3)
should contain_neutron_config('DEFAULT/max_l3_agents_per_router').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/l3_ha_net_cidr').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/l3_ha_network_type').with_value('<SERVICE DEFAULT>')
should contain_neutron_config('DEFAULT/l3_ha_network_physical_name').with_value('<SERVICE DEFAULT>')