615a3a2c60
Package latest puppet-dnsmasq from the same repo as the one used on CentOS 7. Remains to be tested to see if this works with Puppet 5. Did build-pkgs. Did build-image. Story: 2009101 Task: 43257 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: I34576ecdd89986c5948e0ed74a9afbb9a7fd9f82
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 35fa3c673307db2ebed20c952817608fadd26fa6 Mon Sep 17 00:00:00 2001
|
|
From: Tao Liu <tao.liu@windriver.com>
|
|
Date: Thu, 22 Jun 2017 16:33:29 -0400
|
|
Subject: [PATCH 1/1] Enable clear the DNS cache on reload
|
|
|
|
---
|
|
manifests/init.pp | 7 +++++++
|
|
manifests/params.pp | 1 +
|
|
templates/dnsmasq.conf.erb | 3 +++
|
|
3 files changed, 11 insertions(+)
|
|
|
|
diff --git a/manifests/init.pp b/manifests/init.pp
|
|
index b66ac17..93276bb 100644
|
|
--- a/manifests/init.pp
|
|
+++ b/manifests/init.pp
|
|
@@ -211,6 +211,11 @@
|
|
# bringing up the link unnecessarily.
|
|
# Default: true
|
|
#
|
|
+# [*clear_on_reload*]
|
|
+# Whenever /etc/resolv.conf is re-read or the upstream servers are set via
|
|
+# DBus, clear the DNS cache.
|
|
+# Default: true
|
|
+#
|
|
# [*filterwin2k*]
|
|
# Uncomment this to filter useless windows-originated DNS requests
|
|
# which can trigger dial-on-demand links needlessly.
|
|
@@ -460,6 +465,7 @@ class dnsmasq (
|
|
$protocol = params_lookup( 'protocol' ),
|
|
$domain_needed = params_lookup( 'domain_needed' ),
|
|
$bogus_priv = params_lookup( 'bogus_priv' ),
|
|
+ $clear_on_reload = params_lookup( 'clear_on_reload' ),
|
|
$filterwin2k = params_lookup( 'filterwin2k' ),
|
|
$resolv_file = params_lookup( 'resolv_file' ),
|
|
$strict_order = params_lookup( 'strict_order' ),
|
|
@@ -531,6 +537,7 @@ class dnsmasq (
|
|
|
|
$bool_domain_needed=any2bool($domain_needed)
|
|
$bool_bogus_priv=any2bool($bogus_priv)
|
|
+ $bool_clear_on_reload=any2bool($clear_on_reload)
|
|
$bool_filterwin2k=any2bool($filterwin2k)
|
|
$bool_strict_order=any2bool($strict_order)
|
|
$bool_no_resolv=any2bool($no_resolv)
|
|
diff --git a/manifests/params.pp b/manifests/params.pp
|
|
index 845e91e..4d8e70a 100644
|
|
--- a/manifests/params.pp
|
|
+++ b/manifests/params.pp
|
|
@@ -84,6 +84,7 @@ class dnsmasq::params {
|
|
|
|
$domain_needed = true
|
|
$bogus_priv = true
|
|
+ $clear_on_reload = true
|
|
$filterwin2k = false
|
|
$resolv_file = ''
|
|
$strict_order = false
|
|
diff --git a/templates/dnsmasq.conf.erb b/templates/dnsmasq.conf.erb
|
|
index bb8d941..109b768 100644
|
|
--- a/templates/dnsmasq.conf.erb
|
|
+++ b/templates/dnsmasq.conf.erb
|
|
@@ -9,6 +9,9 @@ bogus-priv
|
|
<% if scope.lookupvar('dnsmasq::bool_domain_needed') -%>
|
|
domain-needed
|
|
<% end -%>
|
|
+<% if scope.lookupvar('dnsmasq::bool_clear_on_reload') -%>
|
|
+clear-on-reload
|
|
+<% end -%>
|
|
<% if scope.lookupvar('dnsmasq::bool_filterwin2k') -%>
|
|
filterwin2k
|
|
<% end -%>
|
|
--
|
|
1.8.3.1
|
|
|