summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huff <shuff@vecna.org>2012-05-15 16:00:36 -0400
committerSteve Huff <shuff@vecna.org>2012-05-15 16:00:36 -0400
commitaa336b4e8fcfc5a9d4ee2acb834d4a5b268f6fcf (patch)
tree24ef5c1e87e1dc21f2a0f5a39fbc455f103f9e6b
parentdca7b9094b9410964f99a88b8878509467adf182 (diff)
(#14497) Add tinker_panic option for ntpd
Automatically sets tinker_panic 0 when $is_virtual is true. This configuration enables ntpd to cope with large clock skews, such as occur when a VM guest is suspended and resumed. More information is available here: http://www.vmware.com/pdf/vmware_timekeeping.pdf
-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 -%>