bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
73 lines
2.8 KiB
Diff
73 lines
2.8 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
|
|
|
|
---
|
|
packstack/puppet/modules/dnsmasq/manifests/init.pp | 7 +++++++
|
|
packstack/puppet/modules/dnsmasq/manifests/params.pp | 1 +
|
|
packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb | 3 +++
|
|
3 files changed, 11 insertions(+)
|
|
|
|
diff --git a/packstack/puppet/modules/dnsmasq/manifests/init.pp b/packstack/puppet/modules/dnsmasq/manifests/init.pp
|
|
index b66ac17..93276bb 100644
|
|
--- a/packstack/puppet/modules/dnsmasq/manifests/init.pp
|
|
+++ b/packstack/puppet/modules/dnsmasq/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/packstack/puppet/modules/dnsmasq/manifests/params.pp b/packstack/puppet/modules/dnsmasq/manifests/params.pp
|
|
index 845e91e..4d8e70a 100644
|
|
--- a/packstack/puppet/modules/dnsmasq/manifests/params.pp
|
|
+++ b/packstack/puppet/modules/dnsmasq/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/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
|
|
index bb8d941..109b768 100644
|
|
--- a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
|
|
+++ b/packstack/puppet/modules/dnsmasq/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
|
|
|