Merge "Add a docker pull retry to docker-puppet.py" into stable/pike

[apex-tripleo-heat-templates.git] / environments / neutron-ovs-dvr.yaml

diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml
index b658d3a..973cbe1 100644 (file)
--- a/environments/neutron-ovs-dvr.yaml
+++ b/environments/neutron-ovs-dvr.yaml
@@ -30,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