X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Ftime%2Fmanifests%2Finit.pp;h=e89210bf24a413f21b1575b12c05032fc2a05de4;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=1900443fde7991e96593221b97f4da4301fd3d50;hpb=0faf9685026413c4b14bc2baa512b27f51b3d65d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/time/manifests/init.pp b/modules/time/manifests/init.pp
index 1900443fd..e89210bf2 100644
--- a/modules/time/manifests/init.pp
+++ b/modules/time/manifests/init.pp
@@ -1,15 +1,13 @@
 class time {
 	include stdlib
 	$localtimeservers = hiera('local-timeservers', [])
-	$physicalHost = $site::allnodeinfo[$fqdn]['physicalHost']
+	$physicalHost = $deprecated::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 $::is_virtual and $::virtual == 'kvm') {
 		include ntp::purge
 		include systemdtimesyncd
 	} else {
 		include ntp
-		include ntpdate
 	}
 }