[MediaWiki-commits] [Gerrit] operations/puppet[production]: l10nupdate: turn back on after holidays

[Thcipriani (Code Review)]

Thcipriani has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/399840 )

Change subject: l10nupdate: turn back on after holidays
......................................................................

l10nupdate: turn back on after holidays

Change-Id: I93c0415c5a7589a5ffecd99dbe77412f17c71c85
---
A modules/profile/manifests/scap/master.pp
M modules/role/manifests/deployment/mediawiki.pp
M modules/scap/manifests/master.pp
3 files changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/399840/1

diff --git a/modules/profile/manifests/scap/master.pp 
b/modules/profile/manifests/scap/master.pp
new file mode 100644
index 0000000..92371c5
--- /dev/null
+++ b/modules/profile/manifests/scap/master.pp
@@ -0,0 +1,10 @@
+# == Class profile::scap::master
+#
+# Sets up a scap master on a host
+class profile::scap::master(
+    $main_deployment_server = hiera('scap::deployment_server'),
+) {
+    class { '::scap::master':
+        run_l10nupdate => ($main_deployment_server == $::fqdn)
+    }
+}
diff --git a/modules/role/manifests/deployment/mediawiki.pp 
b/modules/role/manifests/deployment/mediawiki.pp
index 8cb17e8..eaf18c8 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -10,7 +10,7 @@
     include ::mediawiki::packages::php5
     include ::profile::mediawiki::nutcracker
     include ::profile::conftool::client
-    include ::scap::master
+    include ::profile::scap::master
     include ::profile::scap::dsh
     include ::scap::ferm
 
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index 8a22ac4..e940ba8 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -6,6 +6,7 @@
     $common_source_path = '/srv/mediawiki-staging',
     $patches_path       = '/srv/patches',
     $rsync_host         = "deployment.${::site}.wmnet",
+    $run_l10nupdate     = false,
     $statsd_host        = 'statsd.eqiad.wmnet',
     $statsd_port        = 8125,
     $deployment_group   = 'wikidev',
@@ -52,11 +53,9 @@
         hosts_allow => 
$::network::constants::special_hosts[$::realm]['deployment_hosts'];
     }
 
-    # TODO: pass this down from a profile (or convert this to a profile!)
-    $main_deployment_server = hiera('scap::deployment_server')
     class { 'scap::l10nupdate':
         deployment_group => $deployment_group,
-        run_l10nupdate   => false,
+        run_l10nupdate   => $run_l10nupdate,
     }
 
     file { '/usr/local/bin/scap-master-sync':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93c0415c5a7589a5ffecd99dbe77412f17c71c85
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>

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