Dduvall has uploaded a new change for review.
https://gerrit.wikimedia.org/r/209310
Change subject: Parameter for whether jobrunner services run by default
......................................................................
Parameter for whether jobrunner services run by default
Change-Id: Id771304c7137810c55577d995030c245220e1ed5
---
M puppet/hieradata/common.yaml
M puppet/modules/mediawiki/manifests/jobrunner.pp
2 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/10/209310/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 7e5d530..6bee279 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -159,6 +159,7 @@
mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
+mediawiki::jobrunner::enable: true
mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
mediawiki::multiwiki::base_domain: '.wiki.local.wmftest.net'
diff --git a/puppet/modules/mediawiki/manifests/jobrunner.pp
b/puppet/modules/mediawiki/manifests/jobrunner.pp
index 0d68443..e51249e 100644
--- a/puppet/modules/mediawiki/manifests/jobrunner.pp
+++ b/puppet/modules/mediawiki/manifests/jobrunner.pp
@@ -5,13 +5,22 @@
#
# === Parameters
#
+# [*enable*]
+# Enable/disable jobrunner services.
+#
# [*dir*]
# Installation directory.
#
class mediawiki::jobrunner(
+ $enable,
$dir,
) {
require ::mediawiki
+
+ $ensure = $enable ? {
+ false => 'stopped',
+ default => 'running',
+ }
git::clone { 'mediawiki/services/jobrunner':
directory => $dir,
@@ -69,15 +78,15 @@
}
service { 'jobrunner':
- enable => true,
- ensure => 'running',
+ enable => $enable,
+ ensure => $ensure,
provider => 'upstart',
require => Mediawiki::Wiki[$::mediawiki::wiki_name],
}
service { 'jobchron':
- enable => true,
- ensure => 'running',
+ enable => $enable,
+ ensure => $ensure,
provider => 'upstart',
require => Mediawiki::Wiki[$::mediawiki::wiki_name],
}
--
To view, visit https://gerrit.wikimedia.org/r/209310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id771304c7137810c55577d995030c245220e1ed5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
