From 1aa00ce8eaabe53e13f72316b722a712841d553c Mon Sep 17 00:00:00 2001 From: Matt Summers Date: Thu, 11 Oct 2012 14:28:43 +0100 Subject: Fix is_virtual check in ntp.conf templates is_virtual fact must be checked using a string comparison. The previous logic would resolve true if the is_virtual fact was defined. This meant that on servers where is_virtual was defined as "false", the vm-only snippet was still inserted into the template. --- templates/ntp.conf.debian.erb | 2 +- templates/ntp.conf.el.erb | 2 +- templates/ntp.conf.freebsd.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/ntp.conf.debian.erb b/templates/ntp.conf.debian.erb index 0525d00..7a3f690 100644 --- a/templates/ntp.conf.debian.erb +++ b/templates/ntp.conf.debian.erb @@ -1,6 +1,6 @@ # /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help -<% if @is_virtual -%> +<% if @is_virtual == "true" -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. tinker panic 0 diff --git a/templates/ntp.conf.el.erb b/templates/ntp.conf.el.erb index 88d6d72..fe8a9a5 100644 --- a/templates/ntp.conf.el.erb +++ b/templates/ntp.conf.el.erb @@ -1,4 +1,4 @@ -<% if @is_virtual -%> +<% if @is_virtual == "true" -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. tinker panic 0 diff --git a/templates/ntp.conf.freebsd.erb b/templates/ntp.conf.freebsd.erb index 954a2a8..7d08644 100644 --- a/templates/ntp.conf.freebsd.erb +++ b/templates/ntp.conf.freebsd.erb @@ -18,7 +18,7 @@ # The option `maxpoll 9' is used to prevent PLL/FLL flipping on FreeBSD. # # Managed by puppet class { "ntp": servers => [ ... ] } -<% if @is_virtual -%> +<% if @is_virtual == "true" -%> # Keep ntpd from panicking in the event of a large clock skew # when a VM guest is suspended and resumed. -- cgit v1.2.3