From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 17 Aug 2017 09:23:08 +0000 (+0200)
Subject: Use new virt factor in time manifest
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=512f9595315a422628aef4f1cc1f4cf51ca41a07;p=mirror%2Fdsa-puppet.git

Use new virt factor in time manifest
---

diff --git a/modules/time/manifests/init.pp b/modules/time/manifests/init.pp
index 1900443fd..808ef2816 100644
--- a/modules/time/manifests/init.pp
+++ b/modules/time/manifests/init.pp
@@ -4,8 +4,8 @@ class time {
 	$physicalHost = $site::allnodeinfo[$fqdn]['physicalHost']
 
 	# if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm'
-	# our is_virtual and virtual facts are broken
-	if ($systemd and $physicalHost and size($localtimeservers) > 0) {
+	#if ($systemd and $physicalHost and size($localtimeservers) > 0) {
+	if ($systemd and size($localtimeservers) > 0 and $::virt == 'kvm') {
 		include ntp::purge
 		include systemdtimesyncd
 	} else {