X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=environments%2Fneutron-ovs-dvr.yaml;h=973cbe16121099ca2613a3d19d5e11fe5e6e99c3;hb=b4fc0c9c52858cc331f120558df29e61ea2b1251;hp=f60edb010466fc3f99ee2eeeef64cc1d84367893;hpb=f86526e209d5040501b102e72a86cf31f9691f99;p=apex-tripleo-heat-templates.git

diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml
index f60edb01..973cbe16 100644
--- a/environments/neutron-ovs-dvr.yaml
+++ b/environments/neutron-ovs-dvr.yaml
@@ -9,6 +9,13 @@ resource_registry:
   # connected to a physical network.
   OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
 
+  # DVR requires a port on the external network for each compute node.
+  # This will usually match the one currently in use for
+  # OS::TripleO::Controller::Ports::ExternalPort.
+  # Please review your network configuration before deploying to ensure that
+  # this is appropriate.
+  OS::TripleO::Compute::Ports::ExternalPort: ../network/ports/noop.yaml
+
 parameter_defaults:
 
   # DVR requires that the L2 population feature is enabled
@@ -23,10 +30,15 @@ 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
+  # that host. It is necessary to reserve memory on the compute nodes to avoid
+  # memory issues when creating instances that are connected to routed
+  # networks. The current expected consumption is 50 MB per router in addition
+  # to the base reserved amount.  Deployers should refer to existing
+  # documentation, release notes, etc. for additional information on estimating
+  # an appropriate value. The provided value here is based on an estimate of 10
+  # routers and is an example value *only* and should be reviewed and modified
+  # if necessary before deploying.
+  NovaReservedHostMemory: 2560