openstack/puppet-neutron
Code Issues Proposed changes

Merge "Add 'state_path' and 'lock_path' for Neutron::Server"

Browse Source
This commit is contained in:
Jenkins 2014-12-10 14:54:19 +00:00 committed by Gerrit Code Review
commit 3be56c82aa
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/server.pp
View File

@ -144,6 +144,16 @@
# report_interval is a config for neutron agents, set by class neutron # report_interval is a config for neutron agents, set by class neutron
# Defaults to: 75 # Defaults to: 75
# #
# [*state_path*]
# (optional) Where to store dnsmasq state files. This directory must be
# writable by the user executing the agent
# Defaults to: /var/lib/neutron
#
# [*lock_path*]
# (optional) Where to store dnsmasq lock files. This directory must be
# writable by the user executing the agent
# Defaults to: /var/lib/neutron/lock
#
# [*router_scheduler_driver*] # [*router_scheduler_driver*]
# (optional) Driver to use for scheduling router to a default L3 agent. Could be: # (optional) Driver to use for scheduling router to a default L3 agent. Could be:
# neutron.scheduler.l3_agent_scheduler.ChanceScheduler to schedule a router in a random way # neutron.scheduler.l3_agent_scheduler.ChanceScheduler to schedule a router in a random way
@ -199,6 +209,8 @@ class neutron::server (
$api_workers = $::processorcount, $api_workers = $::processorcount,
$rpc_workers = $::processorcount, $rpc_workers = $::processorcount,
$agent_down_time = '75', $agent_down_time = '75',
$state_path = '/var/lib/neutron',
$lock_path = '/var/lib/neutron/lock',
$router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler', $router_scheduler_driver = 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler',
$router_distributed = false, $router_distributed = false,
$l3_ha = false, $l3_ha = false,
@ -278,6 +290,8 @@ class neutron::server (
'DEFAULT/rpc_workers': value => $rpc_workers; 'DEFAULT/rpc_workers': value => $rpc_workers;
'DEFAULT/agent_down_time': value => $agent_down_time; 'DEFAULT/agent_down_time': value => $agent_down_time;
'DEFAULT/router_scheduler_driver': value => $router_scheduler_driver; 'DEFAULT/router_scheduler_driver': value => $router_scheduler_driver;
'DEFAULT/state_path': value => $state_path;
'DEFAULT/lock_path': value => $lock_path;
'DEFAULT/router_distributed': value => $router_distributed; 'DEFAULT/router_distributed': value => $router_distributed;
'database/connection': value => $database_connection, secret => true; 'database/connection': value => $database_connection, secret => true;
'database/idle_timeout': value => $database_idle_timeout; 'database/idle_timeout': value => $database_idle_timeout;

4
spec/classes/neutron_server_spec.rb
View File

@ -28,6 +28,8 @@ describe 'neutron::server' do
:database_max_overflow => '20', :database_max_overflow => '20',
:sync_db => false, :sync_db => false,
:agent_down_time => '75', :agent_down_time => '75',
:state_path => '/var/lib/neutron',
:lock_path => '/var/lib/neutron/lock',
:router_scheduler_driver => 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler', :router_scheduler_driver => 'neutron.scheduler.l3_agent_scheduler.ChanceScheduler',
:router_distributed => false, :router_distributed => false,
:l3_ha => false, :l3_ha => false,
@ -96,6 +98,8 @@ describe 'neutron::server' do
should contain_neutron_config('DEFAULT/rpc_workers').with_value(facts[:processorcount]) should contain_neutron_config('DEFAULT/rpc_workers').with_value(facts[:processorcount])
should contain_neutron_config('DEFAULT/agent_down_time').with_value(p[:agent_down_time]) should contain_neutron_config('DEFAULT/agent_down_time').with_value(p[:agent_down_time])
should contain_neutron_config('DEFAULT/router_scheduler_driver').with_value(p[:router_scheduler_driver]) should contain_neutron_config('DEFAULT/router_scheduler_driver').with_value(p[:router_scheduler_driver])
should contain_neutron_config('DEFAULT/state_path').with_value(p[:state_path])
should contain_neutron_config('DEFAULT/lock_path').with_value(p[:lock_path])
end end
context 'with manage_service as false' do context 'with manage_service as false' do