openstack/puppet-neutron
Code Issues Proposed changes

Support allow_automatic_dhcp_failover config option

Browse Source 
Change-Id: I49a18585b13e20daf121ba1945ac8700ff585616
This commit is contained in:
Sam Morrison 2016-06-21 13:10:14 +10:00
parent c8c790cd8b
commit c9bb66d1ac
2 changed files with 13 additions and 0 deletions
manifests
server.pp
spec/classes
neutron_server_spec.rb

7
manifests/server.pp

@ -205,6 +205,11 @@
# admin_state_up set to True to alive agents.
# Defaults to $::os_service_default
#
# [*allow_automatic_dhcp_failover*]
# (optional) Allow automatic rescheduling of dhcp from dead dhcp agents with
# admin_state_up set to True to alive agents.
# Defaults to $::os_service_default
#
# [*l3_ha*]
# (optional) Enable high availability for virtual routers.
# Defaults to false
@ -335,6 +340,7 @@ class neutron::server (
$dhcp_load_type = $::os_service_default,
$default_availability_zones = $::os_service_default,
$allow_automatic_l3agent_failover = $::os_service_default,
$allow_automatic_dhcp_failover = $::os_service_default,
$l3_ha = false,
$max_l3_agents_per_router = 3,
$min_l3_agents_per_router = 2,
@ -444,6 +450,7 @@ class neutron::server (
'DEFAULT/router_scheduler_driver': value => $router_scheduler_driver;
'DEFAULT/router_distributed': value => $router_distributed;
'DEFAULT/allow_automatic_l3agent_failover': value => $allow_automatic_l3agent_failover;
'DEFAULT/allow_automatic_dhcp_failover': value => $allow_automatic_dhcp_failover;
'DEFAULT/network_scheduler_driver': value => $network_scheduler_driver;
'DEFAULT/dhcp_load_type': value => $dhcp_load_type;
'DEFAULT/default_availability_zones': value => join(any2array($default_availability_zones), ',');

6
spec/classes/neutron_server_spec.rb

@ -186,6 +186,12 @@ describe 'neutron::server' do
end
end
context 'with allow_automatic_dhcp_failover in neutron.conf' do
it 'should configure allow_automatic_dhcp_failover' do
is_expected.to contain_neutron_config('DEFAULT/allow_automatic_dhcp_failover').with_value('<SERVICE DEFAULT>')
end
end
context 'with qos_notification_drivers parameter' do
before :each do
params.merge!(:qos_notification_drivers => 'message_queue')