From 9efa81796e3edd3017d19ff3544f52874b7a2df6 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 15 May 2017 13:20:25 -0700 Subject: [PATCH] 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 --- puppet/services/neutron-api.yaml | 1 + ...h-enable_dvr-with-NeutronEnableDVR-fe8aac6c4ce52bce.yaml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/notes/match-enable_dvr-with-NeutronEnableDVR-fe8aac6c4ce52bce.yaml diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index b4a21a3125..8e1e0b8052 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 0000000000..5440043283 --- /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.