openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "neutron: set enable_dvr = False if NeutronEnableDVR is false"

This commit is contained in:
Jenkins 2017-05-18 23:14:45 +00:00 committed by Gerrit Code Review
parent eabb6d7c30 9efa81796e
commit 3ca1a2d99d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/services/neutron-api.yaml
View File

@ -166,6 +166,7 @@ outputs:
- 9696
- 13696
neutron::server::router_distributed: {get_param: NeutronEnableDVR}
neutron::server::enable_dvr: {get_param: NeutronEnableDVR}
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
# for the given network; replacement examples (eg. for internal_api):
# internal_api -> IP

6
releasenotes/notes/match-enable_dvr-with-NeutronEnableDVR-fe8aac6c4ce52bce.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Neutron API controller no longer advertises ``dvr`` extension if the
cloud is not configured for DVR. This is achieved by setting ``enable_dvr``
to match ``NeutronEnableDVR`` setting.