Merge "swift/proxy: remove swift::proxy::ceilometer::rabbit_host"

[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..b658d3a 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,11 @@ 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'
+
+  # 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