From bcc2a2d5e26e6770793b3dea80ac7c6f5e9aa0da Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Tue, 29 May 2018 10:10:58 -0230 Subject: [PATCH] Support containerized DVR in compute role This patch adds the required parameters to the Compute role so the agents are configured properly on upgrade. Conflicts: environments/neutron-ovs-dvr.yaml Related-Bug: #1774199 Change-Id: Iab42ae0fb13e8e92cc9903432a95e04a94a5913c (cherry picked from commit f51f84e7818f7f70e4f6f298fff6d57509af4fbd) --- environments/neutron-ovs-dvr.yaml | 19 +++++++++---------- ...de-to-dvr-containers-bc876f82f3e9f139.yaml | 7 +++++++ 2 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/role-support-for-upgrade-to-dvr-containers-bc876f82f3e9f139.yaml diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index f4522ed5ea..13e5a5f0e7 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/environments/neutron-ovs-dvr.yaml @@ -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' diff --git a/releasenotes/notes/role-support-for-upgrade-to-dvr-containers-bc876f82f3e9f139.yaml b/releasenotes/notes/role-support-for-upgrade-to-dvr-containers-bc876f82f3e9f139.yaml new file mode 100644 index 0000000000..0534d3661e --- /dev/null +++ b/releasenotes/notes/role-support-for-upgrade-to-dvr-containers-bc876f82f3e9f139.yaml @@ -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.