Puppet Neutron is missing dnsmasq_local_resolv option

[Felipe Alfaro Solana]

Puppet Neutron code is missing OpenStack Neutron configuration option named "dnsmasq_local_resolv" as described in https://docs.openstack.org/newton/networking-guide/config-dns-res.html.

[Felipe Alfaro Solana (felipe-alfaro-gmail)]

This patch exposes the configuration option:

--- a/templates/puppet/neutron/manifests/agents/dhcp.pp
+++ b/templates/puppet/neutron/manifests/agents/dhcp.pp
@@ -45,6 +45,11 @@
 # (optional) List of servers to use as dnsmasq forwarders.
 # Defaults to $::os_service_default.
 #
+# [*dnsmasq_local_resolv*]
+# (optional) Enables the dnsmasq service to provide name resolution for
+# instances via DNS resolvers on the host running the DHCP agent.
+# Defaults to False
+#
 # [*enable_isolated_metadata*]
 # (optional) enable metadata support on isolated networks.
 # Defaults to false.
@@ -96,6 +101,7 @@ class neutron::agents::dhcp (
   $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
   $dnsmasq_config_file = $::os_service_default,
   $dnsmasq_dns_servers = $::os_service_default,
+ $dnsmasq_local_resolv = false,
   $enable_isolated_metadata = false,
   $enable_force_metadata = $::os_service_default,
   $enable_metadata_network = false,
@@ -148,6 +154,7 @@ class neutron::agents::dhcp (
     'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply;
     'DEFAULT/dnsmasq_config_file': value => $dnsmasq_config_file;
     'DEFAULT/dnsmasq_dns_servers': value => join(any2array($dnsmasq_dns_servers), ',');
+ 'DEFAULT/dnsmasq_local_resolv': value => $dnsmasq_local_resolv;
     'DEFAULT/ovs_integration_bridge': value => $ovs_integration_bridge;
     'AGENT/availability_zone': value => $availability_zone;
   }

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/516869

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/516869
Committed: https://git.openstack.org/cgit/openstack/puppet-neutron/commit/?id=c8f2190761be017d4e2de9a7125c3336bb731afe
Submitter: Zuul
Branch: master

commit c8f2190761be017d4e2de9a7125c3336bb731afe
Author: ZhongShengping <[e-mail]>
Date: Wed Nov 1 15:13:45 2017 +0800

    Add dnsmasq_local_resolv option

    Add 'dnsmasq_local_resolv' option support to Enables the dnsmasq
    service to provide name resolution for instances via DNS resolvers
    on the host running the DHCP agent.

    Change-Id: I451777a573fd31dd5d6732303956f17bb67c22e0
    Closes-Bug: #1728795

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/puppet-neutron 12.1.0 release.