summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Thulin <fredrik@thulin.net>2014-05-26 14:11:12 +0200
committerFredrik Thulin <fredrik@thulin.net>2014-05-26 14:11:12 +0200
commit15b5d5a36f1a6adcefa7bb9026a50fa9d8557994 (patch)
treef574b7745ab2d12d0d84acdb596f8ca0781a1acf
parent26b0d3607c0505d36c2837f8277e75b4b3545315 (diff)
avoid double declarationssunet-ops-2014-05-26-v10
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/server.pp7
1 files changed, 4 insertions, 3 deletions
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':