openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Align some defaults with with ControllerCount default 

NeutronDhcpAgentsPerNetwork is normally correlated with the
number of controllers, so given that the template
defaults the ControllerCount to 1, 1 seems like a more consistent
value for NeutronDhcpAgentsPerNetwork, and it's consistent with
what we test in CI.

Also NeutronL3HA defaults to False, which is consistent with the default
ControllerCount of 1, but NeutronAllowL3AgentFailover defaults to
True, which I assume makes no sense if there's only 1 controller
and no HA

Change-Id: I4612060979d1e4381800f30e359f58aeef61b861
(cherry picked from commit 1029b994d1)
This commit is contained in:
Steven Hardy 2015-10-07 17:51:30 +01:00 committed by marios
parent d66e55ee89
commit d801de7b5d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
overcloud-without-mergepy.yaml
View File

@ -215,7 +215,7 @@ parameters:
values, use a comma separated string, like so: 'openvswitch,l2_population'
type: string
NeutronAllowL3AgentFailover:
default: 'True'
default: 'False'
description: Allow automatic l3-agent failover
type: string
NeutronL3HA:
@ -224,7 +224,7 @@ parameters:
type: string
NeutronDhcpAgentsPerNetwork:
type: number
default: 3
default: 1
description: The number of neutron dhcp agents to schedule per network
NovaPassword:
default: unset