From 15b5d5a36f1a6adcefa7bb9026a50fa9d8557994 Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Mon, 26 May 2014 14:11:12 +0200
Subject: avoid double declarations

---
 global/overlay/etc/puppet/modules/sunet/manifests/server.pp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'global/overlay')

diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
index 4852e17..14df323 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/server.pp
@@ -37,9 +37,10 @@ define sunet::server() {
     notify => Service['ssh'],
   }
 
-  service { 'ntp':
-    ensure    => 'running',
-  }
+  # already declared in puppet-cosmos/manifests/ntp.pp
+  #service { 'ntp':
+  #  ensure    => 'running',
+  #}
 
   # Don't use pool.ntp.org servers, but rather DHCP provided NTP servers
   line { 'no_pool_ntp_org_servers':
-- 
cgit v1.1