From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 28 Dec 2014 09:57:45 +0000 (+0000)
Subject: run ntp everywhere again
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=242a3b9255b298f636ae16c805756268e9efdff0;p=mirror%2Fdsa-puppet.git

run ntp everywhere again

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 0cfb62563..35f0669d0 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -4,16 +4,9 @@ class ntp {
 		ensure => installed
 	}
 
-	if ($::lsbmajdistrelease >= 8) {
-		service { 'ntp':
-			ensure  => stopped,
-			require => Package['ntp']
-		}
-	} else {
-		service { 'ntp':
-			ensure  => running,
-			require => Package['ntp']
-		}
+	service { 'ntp':
+		ensure  => running,
+		require => Package['ntp']
 	}
 
 	@ferm::rule { 'dsa-ntp':