From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 20 Dec 2014 20:45:00 +0000 (+0100)
Subject: stable may run ntp again
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=a08c3df5ced2aa6a573306b68da976967321998a;p=dsa-puppet.git

stable may run ntp again
---

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