Merge "Remove calculation for NeutronDhcpAgentsPerNetwork"
This commit is contained in:
commit
f47c627320
@ -0,0 +1,6 @@
|
||||
---
|
||||
fixes:
|
||||
- |
|
||||
Removed setting NeutronDhcpAgentsPerNetwork based on controller count.
|
||||
If not overridden by the user, it should be calculated based on the
|
||||
number of neutron DHCP agents that are actually deployed.
|
@ -137,7 +137,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
||||
'ExtraConfig': '{}',
|
||||
'HypervisorNeutronPhysicalBridge': 'br-ex',
|
||||
'HypervisorNeutronPublicInterface': 'nic1',
|
||||
'NeutronDhcpAgentsPerNetwork': 1,
|
||||
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
|
||||
'NeutronFlatNetworks': 'datacentre',
|
||||
'NeutronPublicInterface': 'nic1',
|
||||
@ -261,7 +260,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
||||
'ExtraConfig': '{}',
|
||||
'HypervisorNeutronPhysicalBridge': 'br-ex',
|
||||
'HypervisorNeutronPublicInterface': 'nic1',
|
||||
'NeutronDhcpAgentsPerNetwork': 1,
|
||||
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
|
||||
'NeutronFlatNetworks': 'datacentre',
|
||||
'NeutronNetworkType': 'gre',
|
||||
@ -1192,7 +1190,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
||||
'ExtraConfig': '{}',
|
||||
'HypervisorNeutronPhysicalBridge': 'br-ex',
|
||||
'HypervisorNeutronPublicInterface': 'nic1',
|
||||
'NeutronDhcpAgentsPerNetwork': 3,
|
||||
'NeutronDnsmasqOptions': 'dhcp-option-force=26,1400',
|
||||
'NeutronFlatNetworks': 'datacentre',
|
||||
'NeutronNetworkType': 'gre',
|
||||
|
@ -105,15 +105,6 @@ class DeployOvercloud(command.Command):
|
||||
if getattr(args, arg, None) is not None:
|
||||
parameters[param] = getattr(args, arg)
|
||||
|
||||
# Scaling needs extra parameters
|
||||
number_controllers = int(parameters.get('ControllerCount', 0))
|
||||
dhcp_agents_per_network = (min(number_controllers, 3) if
|
||||
number_controllers else 1)
|
||||
|
||||
parameters.update({
|
||||
'NeutronDhcpAgentsPerNetwork': dhcp_agents_per_network,
|
||||
})
|
||||
|
||||
return parameters
|
||||
|
||||
def _create_registration_env(self, args):
|
||||
|
Loading…
Reference in New Issue
Block a user