1 From 35fa3c673307db2ebed20c952817608fadd26fa6 Mon Sep 17 00:00:00 2001
2 From: Tao Liu <tao.liu@windriver.com>
3 Date: Thu, 22 Jun 2017 16:33:29 -0400
4 Subject: [PATCH 1/1] Enable clear the DNS cache on reload
7 packstack/puppet/modules/dnsmasq/manifests/init.pp | 7 +++++++
8 packstack/puppet/modules/dnsmasq/manifests/params.pp | 1 +
9 packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb | 3 +++
10 3 files changed, 11 insertions(+)
12 diff --git a/packstack/puppet/modules/dnsmasq/manifests/init.pp b/packstack/puppet/modules/dnsmasq/manifests/init.pp
13 index b66ac17..93276bb 100644
14 --- a/packstack/puppet/modules/dnsmasq/manifests/init.pp
15 +++ b/packstack/puppet/modules/dnsmasq/manifests/init.pp
17 # bringing up the link unnecessarily.
20 +# [*clear_on_reload*]
21 +# Whenever /etc/resolv.conf is re-read or the upstream servers are set via
22 +# DBus, clear the DNS cache.
26 # Uncomment this to filter useless windows-originated DNS requests
27 # which can trigger dial-on-demand links needlessly.
28 @@ -460,6 +465,7 @@ class dnsmasq (
29 $protocol = params_lookup( 'protocol' ),
30 $domain_needed = params_lookup( 'domain_needed' ),
31 $bogus_priv = params_lookup( 'bogus_priv' ),
32 + $clear_on_reload = params_lookup( 'clear_on_reload' ),
33 $filterwin2k = params_lookup( 'filterwin2k' ),
34 $resolv_file = params_lookup( 'resolv_file' ),
35 $strict_order = params_lookup( 'strict_order' ),
36 @@ -531,6 +537,7 @@ class dnsmasq (
38 $bool_domain_needed=any2bool($domain_needed)
39 $bool_bogus_priv=any2bool($bogus_priv)
40 + $bool_clear_on_reload=any2bool($clear_on_reload)
41 $bool_filterwin2k=any2bool($filterwin2k)
42 $bool_strict_order=any2bool($strict_order)
43 $bool_no_resolv=any2bool($no_resolv)
44 diff --git a/packstack/puppet/modules/dnsmasq/manifests/params.pp b/packstack/puppet/modules/dnsmasq/manifests/params.pp
45 index 845e91e..4d8e70a 100644
46 --- a/packstack/puppet/modules/dnsmasq/manifests/params.pp
47 +++ b/packstack/puppet/modules/dnsmasq/manifests/params.pp
48 @@ -84,6 +84,7 @@ class dnsmasq::params {
52 + $clear_on_reload = true
56 diff --git a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
57 index bb8d941..109b768 100644
58 --- a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
59 +++ b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
60 @@ -9,6 +9,9 @@ bogus-priv
61 <% if scope.lookupvar('dnsmasq::bool_domain_needed') -%>
64 +<% if scope.lookupvar('dnsmasq::bool_clear_on_reload') -%>
67 <% if scope.lookupvar('dnsmasq::bool_filterwin2k') -%>