Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338333 )
Change subject: Move the Diamond NTP collector to ntp::daemon
......................................................................
Move the Diamond NTP collector to ntp::daemon
ntp::daemon is used by both the NTP servers and the remaining
clients not (yet) using timesyncd, so move the Diamond collector
into it (it was previously used on the NTP servers as well)
Change-Id: Iea68010a141cb2998221e74e98e43d5949359382
---
M modules/ntp/manifests/daemon.pp
M modules/standard/manifests/ntp/client.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ntp/manifests/daemon.pp b/modules/ntp/manifests/daemon.pp
index 0ad671e..eadea10 100644
--- a/modules/ntp/manifests/daemon.pp
+++ b/modules/ntp/manifests/daemon.pp
@@ -10,6 +10,8 @@
content => template('ntp/ntp-conf.erb'),
}
+ diamond::collector { 'Ntpd': }
+
service { 'ntp':
ensure => ensure_service($ensure),
require => [ File['ntp.conf'], Package['ntp'] ],
diff --git a/modules/standard/manifests/ntp/client.pp
b/modules/standard/manifests/ntp/client.pp
index 91f7bf5..41755f9 100644
--- a/modules/standard/manifests/ntp/client.pp
+++ b/modules/standard/manifests/ntp/client.pp
@@ -13,8 +13,6 @@
ulsfo => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
}
- diamond::collector { 'Ntpd': }
-
ntp::daemon { 'client':
servers => $client_upstreams[$::site],
query_acl => $::standard::ntp::monitoring_acl,
--
To view, visit https://gerrit.wikimedia.org/r/338333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea68010a141cb2998221e74e98e43d5949359382
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
