From 1029b994d1b5e0c641da97886f75d982eb2c10f0 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 7 Oct 2015 17:51:30 +0100 Subject: [PATCH] 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 --- overcloud-without-mergepy.yaml | 4 ++-- 1 file 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 -- 2.16.6