diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-26 17:19:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-26 17:19:02 +0000 |
commit | 73991e39b39c1809d1b80a458f3e65256bb64a9e (patch) | |
tree | ebf45157a89f3d69c7c8d1b16126b85f371a5345 | |
parent | ded2386f8b867d5d35b4cb0274bbb1af99f3364f (diff) | |
parent | e9cb6de817a60a84fb9ff7288c94bbcd281b5695 (diff) |
Merge "Allow dnsmasq_dns_servers to be configured for DHCP Agent"
-rw-r--r-- | puppet/services/neutron-dhcp.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
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' |