[MediaWiki-commits] [Gerrit] operations/puppet[production]: move cronjobs class from role to snapshot module and add use...

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged.

Change subject: move cronjobs class from role to snapshot module and add user 
param
......................................................................


move cronjobs class from role to snapshot module and add user param

this leaves us with (mostly) only role classes proper, plus one common
class for inclusion in all of them

Change-Id: I98c071af5b10fe4713c1ac3acf85abfadb8957ed
---
D modules/role/manifests/snapshot/cronjobs.pp
M modules/role/manifests/snapshot/cronrunner.pp
A modules/snapshot/manifests/cron.pp
3 files changed, 13 insertions(+), 12 deletions(-)

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



diff --git a/modules/role/manifests/snapshot/cronjobs.pp 
b/modules/role/manifests/snapshot/cronjobs.pp
deleted file mode 100644
index 68c5583..0000000
--- a/modules/role/manifests/snapshot/cronjobs.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class role::snapshot::cronjobs {
-    include dataset::user
-    class { '::snapshot::cron::mediaperprojectlists': user => 'datasets' }
-    class { '::snapshot::cron::pagetitles': user   => 'datasets' }
-    class { '::snapshot::cron::cirrussearch': user   => 'datasets' }
-    class { '::snapshot::cron::centralauthdump': user   => 'datasets' }
-    class { '::snapshot::cron::dumplists': user   => 'datasets' }
-    class { '::snapshot::cron::wikidatadumps::json': user   => 'datasets' }
-    class { '::snapshot::cron::wikidatadumps::ttl': user   => 'datasets' }
-    class { '::snapshot::addschanges': user   => 'datasets' }
-}
diff --git a/modules/role/manifests/snapshot/cronrunner.pp 
b/modules/role/manifests/snapshot/cronrunner.pp
index 35f7ed9..a7397bd 100644
--- a/modules/role/manifests/snapshot/cronrunner.pp
+++ b/modules/role/manifests/snapshot/cronrunner.pp
@@ -7,7 +7,7 @@
 
     if hiera('snapshot::cron::misc', false) {
         # cron jobs
-        include role::snapshot::cronjobs
+        class { '::snapshot::cron': user   => 'datasets' }
 
         system::role { 'role::snapshot::cronrunner':
             description => 'runner of misc dump-related cron jobs',
diff --git a/modules/snapshot/manifests/cron.pp 
b/modules/snapshot/manifests/cron.pp
new file mode 100644
index 0000000..1c32625
--- /dev/null
+++ b/modules/snapshot/manifests/cron.pp
@@ -0,0 +1,12 @@
+class snapshot::cron(
+    $user = undef,
+) {
+    class { '::snapshot::cron::mediaperprojectlists': user => $user }
+    class { '::snapshot::cron::pagetitles': user   => $user }
+    class { '::snapshot::cron::cirrussearch': user   => $user }
+    class { '::snapshot::cron::centralauthdump': user   => $user }
+    class { '::snapshot::cron::dumplists': user   => $user }
+    class { '::snapshot::cron::wikidatadumps::json': user   => $user }
+    class { '::snapshot::cron::wikidatadumps::ttl': user   => $user }
+    class { '::snapshot::addschanges': user   => $user }
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I98c071af5b10fe4713c1ac3acf85abfadb8957ed
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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