openstack/puppet-neutron
Code Issues Proposed changes

Improve multi DHCP agent support

Browse Source 
Since Grizzly release, a specific number of DHCP agents can be scheduled to host a
network.
This enables redundant DHCP agents for configured networks.

Change-Id: I3388282c0a46eafa2b4e0e6d2d0293fa91e46cc3
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-11-05 16:23:42 +08:00
parent 2c57517e04
commit d0b754cd50
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
manifests/init.pp
View File

@@ -57,6 +57,11 @@
# (optional) DHCP lease
# Defaults to 120 seconds
#
# [*dhcp_agents_per_network*]
# (optional) Number of DHCP agents scheduled to host a network.
# This enables redundant DHCP agents for configured networks.
# Defaults to 1
#
# [*allow_bulk*]
# (optional) Enable bulk crud operations
# Defaults to true
@@ -121,6 +126,7 @@ class neutron (
$base_mac = 'fa:16:3e:00:00:00',
$mac_generation_retries = 16,
$dhcp_lease_duration = 120,
$dhcp_agents_per_network = 1,
$allow_bulk = true,
$allow_overlapping_ips = false,
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
@@ -173,20 +179,21 @@ class neutron (
}
neutron_config {
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/core_plugin': value => $core_plugin;
'DEFAULT/base_mac': value => $base_mac;
'DEFAULT/mac_generation_retries': value => $mac_generation_retries;
'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration;
'DEFAULT/allow_bulk': value => $allow_bulk;
'DEFAULT/allow_overlapping_ips': value => $allow_overlapping_ips;
'DEFAULT/control_exchange': value => $control_exchange;
'DEFAULT/rpc_backend': value => $rpc_backend;
'AGENT/root_helper': value => $root_helper;
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/core_plugin': value => $core_plugin;
'DEFAULT/base_mac': value => $base_mac;
'DEFAULT/mac_generation_retries': value => $mac_generation_retries;
'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration;
'DEFAULT/dhcp_agents_per_network': value => $dhcp_agents_per_network;
'DEFAULT/allow_bulk': value => $allow_bulk;
'DEFAULT/allow_overlapping_ips': value => $allow_overlapping_ips;
'DEFAULT/control_exchange': value => $control_exchange;
'DEFAULT/rpc_backend': value => $rpc_backend;
'AGENT/root_helper': value => $root_helper;
}
if $service_plugins {

1
spec/classes/neutron_init_spec.rb
View File

@@ -93,6 +93,7 @@ describe 'neutron' do
should contain_neutron_config('DEFAULT/base_mac').with_value('fa:16:3e:00:00:00')
should contain_neutron_config('DEFAULT/mac_generation_retries').with_value(16)
should contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value(120)
should contain_neutron_config('DEFAULT/dhcp_agents_per_network').with_value(1)
should contain_neutron_config('DEFAULT/allow_bulk').with_value(true)
should contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value(false)
should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')