Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338364 )
Change subject: Reorder check for timesyncd or ntpd
......................................................................
Reorder check for timesyncd or ntpd
More compact/readable, as suggested by Faidon in 337009 (PS5)
Change-Id: Iab17bf50c364d82d9e344b079bd9e2dd77e166fd
---
M modules/standard/manifests/init.pp
1 file changed, 3 insertions(+), 7 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/standard/manifests/init.pp
b/modules/standard/manifests/init.pp
index cc06107..d6c3a2d 100644
--- a/modules/standard/manifests/init.pp
+++ b/modules/standard/manifests/init.pp
@@ -13,14 +13,10 @@
include ::profile::cumin::target
}
- if hiera('use_timesyncd', false) or (os_version('debian >= stretch')) {
- unless $::fqdn in $::standard::ntp::wmf_peers[$::site] {
+ unless $::fqdn in $::standard::ntp::wmf_peers[$::site] {
+ if hiera('use_timesyncd', false) or (os_version('debian >= stretch')) {
include ::standard::ntp::timesyncd
- }
- }
- else
- {
- unless $::fqdn in $::standard::ntp::wmf_peers[$::site] {
+ } else {
include ::standard::ntp::client
}
}
--
To view, visit https://gerrit.wikimedia.org/r/338364
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab17bf50c364d82d9e344b079bd9e2dd77e166fd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
