ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300865
Change subject: move dump of cirrus search data to snapshot1007
......................................................................
move dump of cirrus search data to snapshot1007
take the opportunity to do small amount of cleanup on the
cirrus dump manifest: no more 'enable' variable, no more
separate system roles per cron job
Change-Id: Id6ba40759254a345d29025eb337872143bfd514b
---
M modules/role/manifests/snapshot/cron/primary.pp
M modules/role/manifests/snapshot/cron/secondary.pp
M modules/role/manifests/snapshot/cronjobs.pp
M modules/snapshot/manifests/cron/cirrussearch.pp
4 files changed, 4 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/300865/1
diff --git a/modules/role/manifests/snapshot/cron/primary.pp
b/modules/role/manifests/snapshot/cron/primary.pp
index dd13ff2..658ae0a 100644
--- a/modules/role/manifests/snapshot/cron/primary.pp
+++ b/modules/role/manifests/snapshot/cron/primary.pp
@@ -21,9 +21,5 @@
enable => true,
user => 'datasets',
}
- class { 'snapshot::cron::cirrussearch':
- enable => true,
- user => 'datasets',
- }
}
diff --git a/modules/role/manifests/snapshot/cron/secondary.pp
b/modules/role/manifests/snapshot/cron/secondary.pp
index 4338ba4..6bf9ec8 100644
--- a/modules/role/manifests/snapshot/cron/secondary.pp
+++ b/modules/role/manifests/snapshot/cron/secondary.pp
@@ -25,9 +25,5 @@
enable => false,
user => 'datasets',
}
- class { 'snapshot::cron::cirrussearch':
- enable => false,
- user => 'datasets',
- }
}
diff --git a/modules/role/manifests/snapshot/cronjobs.pp
b/modules/role/manifests/snapshot/cronjobs.pp
index 19d0aa6..cf36cdf 100644
--- a/modules/role/manifests/snapshot/cronjobs.pp
+++ b/modules/role/manifests/snapshot/cronjobs.pp
@@ -2,4 +2,5 @@
include dataset::user
class { '::snapshot::cron::mediaperprojectlists': user => 'datasets' }
class { '::snapshot::cron::pagetitles': user => 'datasets' }
+ class { '::snapshot::cron::cirrussearch': user => 'datasets' }
}
diff --git a/modules/snapshot/manifests/cron/cirrussearch.pp
b/modules/snapshot/manifests/cron/cirrussearch.pp
index 57fec48..7acb29d 100644
--- a/modules/snapshot/manifests/cron/cirrussearch.pp
+++ b/modules/snapshot/manifests/cron/cirrussearch.pp
@@ -1,17 +1,7 @@
class snapshot::cron::cirrussearch(
- $enable = true,
$user = undef,
) {
- if ($enable == true) {
- $ensure = 'present'
- } else {
- $ensure = 'absent'
- }
-
- system::role { 'snapshot::cirrussearch':
- ensure => $ensure,
- description => 'producer of weekly cirrussearch json dumps'
- }
+ $confdir = "${snapshot::dumps::dirs::dumpsdir}/confs"
file { '/var/log/cirrusdump':
ensure => 'directory',
@@ -35,8 +25,8 @@
}
cron { 'cirrussearch-dump':
- ensure => $ensure,
- command => "${scriptPath} --config
${snapshot::dumps::dirs::dumpsdir}/confs/wikidump.conf",
+ ensure => 'present',
+ command => "${scriptPath} --config ${confdir}/wikidump.conf",
environment => '[email protected]',
user => $user,
minute => '15',
--
To view, visit https://gerrit.wikimedia.org/r/300865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6ba40759254a345d29025eb337872143bfd514b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
