Dzahn has submitted this change and it was merged.

Change subject: let misc::maintenance::updatequerypages use $enabled like the 
other maintenance jobs, avoid puppet breakage due to Invalid parameter enabled 
when trying to use $enabled in site.pp
......................................................................


let misc::maintenance::updatequerypages use $enabled like the other
maintenance jobs, avoid puppet breakage due to Invalid parameter enabled
when trying to use $enabled in site.pp

Change-Id: I1f1a53e6ace25e8bb511a3b04311e7b28890cb8b
---
M manifests/misc/maintenance.pp
1 file changed, 37 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/misc/maintenance.pp b/manifests/misc/maintenance.pp
index 7fce450..9bd8728 100644
--- a/manifests/misc/maintenance.pp
+++ b/manifests/misc/maintenance.pp
@@ -394,7 +394,7 @@
 
 }
 
-class misc::maintenance::updatequerypages {
+class misc::maintenance::updatequerypages( $enabled = false ) {
         # Include this to add cron jobs calling updateSpecialPages.php on all 
clusters.
 
         file { '/home/mwdeploy/updateSpecialPages':
@@ -414,37 +414,66 @@
                         hour => 1,
                         minute => 0,
                         monthday => $monthday,
-                        ensure => present,
                 }
 
                 cron { "cron-updatequerypages-ancientpages-${name}":
                         command => "/usr/local/bin/mwscriptwikiset 
updateSpecialPages.php ${cluster}.dblist --override --only=AncientPages > 
/home/mwdeploy/updateSpecialPages/${name}-AncientPages.log 2>&1",
-                        month => [1, 7]
+                        month => [1, 7],
+                        ensure => $enabled ?{
+                          true => present,
+                          false => absent,
+                          default => absent
+                        };
                 }
 
                 cron { "cron-updatequerypages-deadendpages-${name}":
                         command => "/usr/local/bin/mwscriptwikiset 
updateSpecialPages.php ${cluster}.dblist --override --only=DeadendPages > 
/home/mwdeploy/updateSpecialPages/${name}-DeadendPages.log 2>&1",
-                        month => [2, 8]
+                        month => [2, 8],
+                        ensure => $enabled ?{
+                          true => present,
+                          false => absent,
+                          default => absent
+                        };
                 }
 
                 cron { "cron-updatequerypages-mostlinked-${name}":
                         command => "/usr/local/bin/mwscriptwikiset 
updateSpecialPages.php ${cluster}.dblist --override --only=MostLinked > 
/home/mwdeploy/updateSpecialPages/${name}-MostLinked.log 2>&1",
-                        month => [3, 9]
+                        month => [3, 9],
+                        ensure => $enabled ?{
+                          true => present,
+                          false => absent,
+                          default => absent
+                        };
                 }
 
                 cron { "cron-updatequerypages-mostrevisions-${name}":
                         command => "/usr/local/bin/mwscriptwikiset 
updateSpecialPages.php ${cluster}.dblist --override --only=MostRevisions > 
/home/mwdeploy/updateSpecialPages/${name}-MostRevisions.log 2>&1",
-                        month => [4, 10]
+                        month => [4, 10],
+                        ensure => $enabled ?{
+                          true => present,
+                          false => absent,
+                          default => absent
+                        };
                 }
 
                 cron { "cron-updatequerypages-wantedpages-${name}":
                         command => "/usr/local/bin/mwscriptwikiset 
updateSpecialPages.php ${cluster}.dblist --override --only=WantedPages > 
/home/mwdeploy/updateSpecialPages/${name}-WantedPages.log 2>&1",
-                        month => [5, 11]
+                        month => [5, 11],
+                        ensure => $enabled ?{
+                          true => present,
+                          false => absent,
+                          default => absent
+                        };
                 }
 
                 cron { "cron-updatequerypages-fewestrevisions-${name}":
                         command => "/usr/local/bin/mwscriptwikiset 
updateSpecialPages.php ${cluster}.dblist --override --only=FewestRevisions > 
/home/mwdeploy/updateSpecialPages/${name}-FewestRevisions.log 2>&1",
-                        month => [6, 12]
+                        month => [6, 12],
+                        ensure => $enabled ?{
+                          true => present,
+                          false => absent,
+                          default => absent
+                        };
                 }
         }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f1a53e6ace25e8bb511a3b04311e7b28890cb8b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to