From 8a849dd03c271a86b0e7990ac3c893794f5361e4 Mon Sep 17 00:00:00 2001 From: John Schwarz Date: Mon, 28 Nov 2016 09:15:01 +0000 Subject: [PATCH] Revert "Set NeutronL3HA to false when deploying DVR" DVR+HA routers are officially supported, so this patch can be reverted. This reverts commit ce39dbac56123354576d2c31674e1b18535b0111. Conflicts: environments/neutron-ovs-dvr.yaml Change-Id: Ifeceb0c3ba01e81403903401ebfe69b9e9d7d2f2 --- environments/neutron-ovs-dvr.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index f4f9990ccc..973cbe1612 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