From: Feng Pan <fpan@redhat.com>
Date: Thu, 19 Jan 2017 22:02:58 +0000 (-0500)
Subject: Allow dnsmasq_dns_servers to be configured for DHCP Agent
X-Git-Tag: opnfv-6.0.0~1164^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e9cb6de817a60a84fb9ff7288c94bbcd281b5695;p=apex-tripleo-heat-templates.git

Allow dnsmasq_dns_servers to be configured for DHCP Agent

Closes-Bug: 1657901
Change-Id: I1491fed0ec79f9cdc5bb04555fdefcf1d29f29c9
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml
index 5e7de18e..bb4742c9 100644
--- a/puppet/services/neutron-dhcp.yaml
+++ b/puppet/services/neutron-dhcp.yaml
@@ -39,6 +39,10 @@ parameters:
     default:
       tag: openstack.neutron.agent.dhcp
       path: /var/log/neutron/dhcp-agent.log
+  NeutronDhcpAgentDnsmasqDnsServers:
+    default: []
+    description: List of servers to use as dnsmasq forwarders
+    type: comma_delimited_list
 
 resources:
 
@@ -64,6 +68,7 @@ outputs:
           - neutron::agents::dhcp::enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata}
             neutron::agents::dhcp::enable_force_metadata: {get_param: NeutronEnableForceMetadata}
             neutron::agents::dhcp::enable_metadata_network: {get_param: NeutronEnableMetadataNetwork}
+            neutron::agents::dhcp::dnsmasq_dns_servers: {get_param: NeutronDhcpAgentDnsmasqDnsServers}
             tripleo.neutron_dhcp.firewall_rules:
               '115 neutron dhcp input':
                 proto: 'udp'