Ori.livneh has submitted this change and it was merged.

Change subject: Don't try to run l10nupdate on mira
......................................................................


Don't try to run l10nupdate on mira

It won't work there yet and is causing errors, but we probably only
ever want it to run from one server at a given time anyway.

Bug: T106460
Change-Id: Ia3f0c968863b121144469ffc7b75e111c0eb102e
---
M hieradata/hosts/mira.yaml
M hieradata/hosts/tin.yaml
M modules/scap/manifests/l10nupdate.pp
3 files changed, 17 insertions(+), 1 deletion(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/hieradata/hosts/mira.yaml b/hieradata/hosts/mira.yaml
index cceebe8..f6f1279 100644
--- a/hieradata/hosts/mira.yaml
+++ b/hieradata/hosts/mira.yaml
@@ -8,3 +8,4 @@
   - parsoid-admin
   - ocg-render-admins
 cluster: misc
+scap::l10nupdate::run_l10nupdate: false
diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml
index ef9a7b9..71b61c0 100644
--- a/hieradata/hosts/tin.yaml
+++ b/hieradata/hosts/tin.yaml
@@ -9,3 +9,4 @@
   - ocg-render-admins
   - wdqs-admins
 cluster: misc
+scap::l10nupdate::run_l10nupdate: true
diff --git a/modules/scap/manifests/l10nupdate.pp 
b/modules/scap/manifests/l10nupdate.pp
index d164880..c443292 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -1,11 +1,25 @@
 # = class: scap::l10nupdate
 #
 # Sets up files and cron required to do l10nupdate
+#
+# == Parameters:
+# [*deployment_group*]
+#   User group that will be allowed to read log files. (default: wikidev)
+#
+# [*run_l10nupdate*]
+#   Should l10nupdate be run automatically from cron? (default: false)
+#
 class scap::l10nupdate(
     $deployment_group = 'wikidev',
+    $run_l10nupdate   = false,
 ) {
+    $ensure_l10nupdate_cron = $run_l10nupdate ? {
+        true    => 'present',
+        default => 'absent',
+    }
+
     cron { 'l10nupdate':
-        ensure  => present,
+        ensure  => $ensure_l10nupdate_cron,
         command => '/usr/local/bin/l10nupdate-1 --verbose >> 
/var/log/l10nupdatelog/l10nupdate.log 2>&1',
         user    => 'l10nupdate',
         hour    => '2',

-- 
To view, visit https://gerrit.wikimedia.org/r/228126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3f0c968863b121144469ffc7b75e111c0eb102e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to