openstack/fuel-library
Code Issues Proposed changes

Merge "Enable multiple Neutron DHCP agents"

Browse Source
This commit is contained in:
Jenkins 2015-03-02 14:04:04 +00:00 committed by Gerrit Code Review
commit b17e3810db
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/cluster/manifests/neutron/dhcp.pp
View File

@ -4,8 +4,8 @@ class cluster::neutron::dhcp (
$primary = false,
$ha_agents = ['ovs', 'metadata', 'dhcp', 'l3'],
$amqp_server_port = 5673,
$multiple_agents = false, # will be enabled as default at 6.1
$agents_per_net = 3, # Value, recommended by Neutron team.
$multiple_agents = true,
$agents_per_net = 2, # Value, recommended by Neutron team.
#keystone settings
$admin_password = 'asdf123',

2
deployment/puppet/openstack/manifests/network.pp
View File

@ -141,7 +141,7 @@ class openstack::network (
allow_overlapping_ips => true,
mac_generation_retries => 32,
dhcp_lease_duration => 600,
dhcp_agents_per_network => 1,
dhcp_agents_per_network => 2,
report_interval => 5,
rabbit_user => $amqp_user,
rabbit_host => $amqp_host,