Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

(#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
  • Loading branch information...
commit aa336b4e8fcfc5a9d4ee2acb834d4a5b268f6fcf 1 parent dca7b90
@hakamadare authored
View
6 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
View
6 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
View
7 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 -%>
Please sign in to comment.
Something went wrong with that request. Please try again.