openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Support containerized DVR in compute role" into stable/queens

This commit is contained in:
Zuul 2018-07-31 21:02:52 +00:00 committed by Gerrit Code Review
parent 73934514ed bcc2a2d5e2
commit 300f6f3b76
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
environments/neutron-ovs-dvr.yaml
View File

@ -2,20 +2,16 @@
# This works by configuring L3 and Metadata agents on the
# compute nodes.
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::ComputeNeutronL3Agent: ../puppet/services/neutron-l3-compute-dvr.yaml
OS::TripleO::Services::ComputeNeutronL3Agent: ../docker/services/neutron-l3.yaml
OS::TripleO::Services::ComputeNeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
# With DVR enabled, the Compute nodes also need the br-ex bridge to be
# connected to a physical network.
# With using default template values, the Compute nodes also need the br-ex
# bridge to be 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
# When using defaults, DVR requires access to the External API network
# for floating IP access. Please check your configuration to ensure that
# networks are configured appropriately.
parameter_defaults:
@ -43,3 +39,6 @@ parameter_defaults:
# routers and is an example value *only* and should be reviewed and modified
# if necessary before deploying.
NovaReservedHostMemory: 2560
ComputeParameters:
NeutronL3AgentMode: 'dvr'

7
releasenotes/notes/role-support-for-upgrade-to-dvr-containers-bc876f82f3e9f139.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
Upgrading DVR deployments may require customization of the Compute role if
they depend on the overcloud's external API network for floating IP
connectivity. If necessary, please add "External" to the list of
networks for the Compute role in roles_data.yaml before upgrading.