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 223c253..973cbe1 100644 (file)
--- 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
@@ -22,3 +29,16 @@ parameter_defaults:
   # We also need to set the proper agent mode for the L3 agent.  This will only
   # affect the agent on the controller node.
   NeutronL3AgentMode: 'dvr_snat'
+
+  # 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