summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-29 17:22:25 +0000
committerGerrit Code Review <review@openstack.org>2016-11-29 17:22:25 +0000
commitfafbefffc49ef3e352b3544ed650db88a67f997b (patch)
tree09b4e735d2acc227995a5be13d0a3687f3af3baf
parentd5211348dbf568c0c52d03e47c6448083d8ac9d2 (diff)
parent8a849dd03c271a86b0e7990ac3c893794f5361e4 (diff)
Merge "Revert "Set NeutronL3HA to false when deploying DVR""
-rw-r--r--environments/neutron-ovs-dvr.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml
index f4f9990c..973cbe16 100644
--- a/environments/neutron-ovs-dvr.yaml
+++ b/environments/neutron-ovs-dvr.yaml
@@ -30,14 +30,6 @@ parameter_defaults:
# affect the agent on the controller node.
NeutronL3AgentMode: 'dvr_snat'
- # L3 HA isn't supported for DVR enabled routers. If upgrading from a system
- # where L3 HA is enabled and has neutron routers configured, it is
- # recommended setting this value to true until such time all routers can be
- # migrated to DVR routers. Once migration of the routers is complete,
- # NeutronL3HA can be returned to false. All new systems should be deployed
- # with NeutronL3HA set to false.
- NeutronL3HA: false
-
# Enabling DVR deploys additional services to the compute nodes that through
# normal operation will consume memory. The amount required is roughly
# proportional to the number of Neutron routers that will be scheduled to