Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet

[mirror/dsa-puppet.git] / modules / time / manifests / init.pp

diff --git a/modules/time/manifests/init.pp b/modules/time/manifests/init.pp
index c6d2550..e89210b 100644 (file)
--- a/modules/time/manifests/init.pp
+++ b/modules/time/manifests/init.pp
@@ -1,14 +1,13 @@
 class time {
        include stdlib
        $localtimeservers = hiera('local-timeservers', [])
-       $physicalHost = $site::allnodeinfo[$fqdn]['physicalHost']
+       $physicalHost = $deprecated::allnodeinfo[$fqdn]['physicalHost']
 
        #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
+       } else {
+               include ntp
        }
 }