diff options
| author | Steve Huff <shuff@vecna.org> | 2012-05-15 16:00:36 -0400 |
|---|---|---|
| committer | Steve Huff <shuff@vecna.org> | 2012-05-15 16:00:36 -0400 |
| commit | aa336b4e8fcfc5a9d4ee2acb834d4a5b268f6fcf (patch) | |
| tree | 24ef5c1e87e1dc21f2a0f5a39fbc455f103f9e6b /templates/ntp.conf.freebsd.erb | |
| parent | dca7b9094b9410964f99a88b8878509467adf182 (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
Diffstat (limited to 'templates/ntp.conf.freebsd.erb')
| -rw-r--r-- | templates/ntp.conf.freebsd.erb | 7 |
1 files changed, 7 insertions, 0 deletions
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 -%> |