openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Set the number for DhcpAgentsPerNetwork to controllers num or 3"

This commit is contained in:
Jenkins 2015-09-23 15:10:11 +00:00 committed by Gerrit Code Review
parent e0778e0ad3 4764f0d56b
commit e72e22c5e7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -151,7 +151,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'NeutronAllowL3AgentFailover': False,
'NeutronBridgeMappings': 'datacentre:br-ex',
'NeutronControlPlaneID': 'network id',
'NeutronDhcpAgentsPerNetwork': 3,
'NeutronDhcpAgentsPerNetwork': 1,
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
'NeutronFlatNetworks': 'datacentre',
'NeutronL3HA': False,
@ -308,7 +308,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'NeutronAllowL3AgentFailover': False,
'NeutronBridgeMappings': 'datacentre:br-ex',
'NeutronControlPlaneID': 'network id',
'NeutronDhcpAgentsPerNetwork': 3,
'NeutronDhcpAgentsPerNetwork': 1,
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
'NeutronEnableTunnelling': 'True',
'NeutronFlatNetworks': 'datacentre',

5
tripleoclient/v1/overcloud_deploy.py
View File

@ -349,9 +349,8 @@ class DeployOvercloud(command.Command):
'Compute-1::NeutronAllowL3AgentFailover': False,
})
# set at least 3 dhcp_agents_per_network
dhcp_agents_per_network = (number_controllers if number_controllers and
number_controllers > 3 else 3)
dhcp_agents_per_network = (min(number_controllers, 3) if
number_controllers else 1)
if args.templates:
parameters.update({