From 91cda5a5a05d9c15bb5f1791dd5ef20a115f0675 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 21 Mar 2023 16:59:50 +0900 Subject: [PATCH] Stop hardcoding l3_ha and max_l3_agents_per_router The current defaults defined in the neutron::server class are same as the service defaults, thus can be replaced by $::os_service_default. Change-Id: I2130ad102e7e479dd3ffa9d4ceb838cdfd6fb649 --- manifests/server.pp | 4 ++-- spec/classes/neutron_server_spec.rb | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index a5c2bba8e..3b49492eb 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -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'], diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index 45ed3f0a6..f8400e499 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -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('') should contain_neutron_config('DEFAULT/l3_ha_net_cidr').with_value('') should contain_neutron_config('DEFAULT/l3_ha_network_type').with_value('') should contain_neutron_config('DEFAULT/l3_ha_network_physical_name').with_value('')