summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorRyan Coleman <ryan@puppetlabs.com>2012-10-09 18:33:51 -0700
committerRyan Coleman <ryan@puppetlabs.com>2012-10-09 18:33:51 -0700
commit8725bb8dc0a744709e09e268f1ea073247d234c5 (patch)
tree5f7a404d3c8ac93dc9ac60fa37546c831311f9b1 /templates
parent8c9af68fa75486465cf1489162da5d7ed9e27204 (diff)
parentaa336b4e8fcfc5a9d4ee2acb834d4a5b268f6fcf (diff)
Merge pull request #19 from hakamadare/master
(#14497) Add tinker_panic option for ntpd
Diffstat (limited to 'templates')
-rw-r--r--templates/ntp.conf.debian.erb6
-rw-r--r--templates/ntp.conf.el.erb6
-rw-r--r--templates/ntp.conf.freebsd.erb7
3 files changed, 19 insertions, 0 deletions
diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb
index 77da814..0525d00 100644
--- a/templates/ntp.conf.debian.erb
+++ b/templates/ntp.conf.debian.erb
@@ -1,5 +1,11 @@
# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+<% if @is_virtual -%>
+# Keep ntpd from panicking in the event of a large clock skew
+# when a VM guest is suspended and resumed.
+tinker panic 0
+
+<% end -%>
driftfile /var/lib/ntp/ntp.drift
diff --git a/templates/ntp.conf.el.erb b/templates/ntp.conf.el.erb
index fc308cc..88d6d72 100644
--- a/templates/ntp.conf.el.erb
+++ b/templates/ntp.conf.el.erb
@@ -1,3 +1,9 @@
+<% if @is_virtual -%>
+# Keep ntpd from panicking in the event of a large clock skew
+# when a VM guest is suspended and resumed.
+tinker panic 0
+
+<% end -%>
# Permit time synchronization with our time source, but do not
# permit the source to query or modify the service on this system.
restrict default kod nomodify notrap nopeer noquery
diff --git a/templates/ntp.conf.freebsd.erb b/templates/ntp.conf.freebsd.erb
index da3df1d..954a2a8 100644
--- a/templates/ntp.conf.freebsd.erb
+++ b/templates/ntp.conf.freebsd.erb
@@ -18,6 +18,13 @@
# The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD.
#
# Managed by puppet class { "ntp": servers => [ ... ] }
+<% if @is_virtual -%>
+
+# Keep ntpd from panicking in the event of a large clock skew
+# when a VM guest is suspended and resumed.
+tinker panic 0
+
+<% end -%>
<% [servers_real].flatten.each do |server| -%>
server <%= server %>
<% end -%>