From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Mon, 15 May 2017 20:20:25 +0000 (-0700)
Subject: neutron: set enable_dvr = False if NeutronEnableDVR is false
X-Git-Tag: opnfv-6.0.0~654^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9efa81796e3edd3017d19ff3544f52874b7a2df6;p=apex-tripleo-heat-templates.git

neutron: set enable_dvr = False if NeutronEnableDVR is false

This will make neutron-server stop advertising dvr extension if the
cloud is not configured to support this flavor of Neutron routers.

Change-Id: I38c8208edff07f7887887918729beb7710068078
Related-Bug: #1450067
---

diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml
index b4a21a31..8e1e0b80 100644
--- a/puppet/services/neutron-api.yaml
+++ b/puppet/services/neutron-api.yaml
@@ -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
diff --git a/releasenotes/notes/match-enable_dvr-with-NeutronEnableDVR-fe8aac6c4ce52bce.yaml b/releasenotes/notes/match-enable_dvr-with-NeutronEnableDVR-fe8aac6c4ce52bce.yaml
new file mode 100644
index 00000000..54400432
--- /dev/null
+++ b/releasenotes/notes/match-enable_dvr-with-NeutronEnableDVR-fe8aac6c4ce52bce.yaml
@@ -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.