meta-stx/recipes-support/puppet/files/puppet-dnsmasq/0004-Enable-clear-DNS-cache-on-reload.patch

   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
   5
   6 ---
   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(+)
  11
  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
  16 @@ -211,6 +211,11 @@
  17  #   bringing up the link unnecessarily.
  18  #   Default: true
  19  #
  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.
  23 +#   Default: true
  24 +#
  25  # [*filterwin2k*]
  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 (
  37
  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 {
  49
  50    $domain_needed = true
  51    $bogus_priv = true
  52 +  $clear_on_reload = true
  53    $filterwin2k = false
  54    $resolv_file = ''
  55    $strict_order = false
  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') -%>
  62  domain-needed
  63  <% end -%>
  64 +<% if scope.lookupvar('dnsmasq::bool_clear_on_reload') -%>
  65 +clear-on-reload
  66 +<% end -%>
  67  <% if scope.lookupvar('dnsmasq::bool_filterwin2k') -%>
  68  filterwin2k
  69  <% end -%>
  70 --
  71 1.8.3.1
  72