openstack/tripleo-heat-templates
Code Issues Proposed changes

Revert "Set NeutronL3HA to false when deploying DVR"

Browse Source 
DVR+HA routers are officially supported, so this patch can be reverted.

This reverts commit ce39dbac56.

Conflicts:
    environments/neutron-ovs-dvr.yaml

Change-Id: Ifeceb0c3ba01e81403903401ebfe69b9e9d7d2f2
This commit is contained in:
John Schwarz 2016-11-28 09:15:01 +00:00
parent 597de6ec40
commit 8a849dd03c
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
environments/neutron-ovs-dvr.yaml
View File

@ -30,14 +30,6 @@ parameter_defaults:
# affect the agent on the controller node. # affect the agent on the controller node.
NeutronL3AgentMode: 'dvr_snat' 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 # Enabling DVR deploys additional services to the compute nodes that through
# normal operation will consume memory. The amount required is roughly # normal operation will consume memory. The amount required is roughly
# proportional to the number of Neutron routers that will be scheduled to # proportional to the number of Neutron routers that will be scheduled to