diff options
author | John Schwarz <jschwarz@redhat.com> | 2016-11-28 09:15:01 +0000 |
---|---|---|
committer | John Schwarz <jschwarz@redhat.com> | 2016-11-28 11:19:22 +0200 |
commit | 8a849dd03c271a86b0e7990ac3c893794f5361e4 (patch) | |
tree | 6931a2523687a810e98880a2ed0e8107a88cb080 /environments | |
parent | 597de6ec400d6971f136a770dc01416e81273409 (diff) |
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
Diffstat (limited to 'environments')
-rw-r--r-- | environments/neutron-ovs-dvr.yaml | 8 |
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 |