diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-11-11 02:07:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-11-11 02:07:22 +0000 |
commit | ac680bff5f8ece671686b7ebffa22eaf17b43474 (patch) | |
tree | 764282568f35ace4172d68162a94da1855ba3150 /overcloud-without-mergepy.yaml | |
parent | b044733893f97eae6ca8f081ee58c28bc9fa1f5a (diff) | |
parent | 1029b994d1b5e0c641da97886f75d982eb2c10f0 (diff) |
Merge "Align some defaults with with ControllerCount default"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r-- | overcloud-without-mergepy.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index 9c915c4a..a1ae3907 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -214,7 +214,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: @@ -223,7 +223,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 |