Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294255
Change subject: mediawiki::jobrunner: systemd compatibility
......................................................................
mediawiki::jobrunner: systemd compatibility
Change-Id: I5368758a4dd799a7651684bbe0dc00d77728c3cf
---
M modules/mediawiki/manifests/jobrunner.pp
A modules/mediawiki/templates/initscripts/jobchron.systemd.erb
R modules/mediawiki/templates/initscripts/jobchron.upstart.erb
A modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
R modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
5 files changed, 35 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/294255/1
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index 1493dd8..8b84ff1 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -36,21 +36,6 @@
notify => Service['jobrunner'],
}
- file { '/etc/init/jobrunner.conf':
- source => 'puppet:///modules/mediawiki/jobrunner.conf',
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['jobrunner'],
- }
-
- file { '/etc/init/jobchron.conf':
- source => 'puppet:///modules/mediawiki/jobchron.conf',
- owner => 'root',
- group => 'root',
- mode => '0444',
- notify => Service['jobchron'],
- }
file { '/etc/jobrunner':
ensure => directory,
@@ -69,15 +54,15 @@
}
$service_ensure = hiera('jobrunner_state', 'running')
- service { 'jobrunner':
- ensure => $service_ensure,
- provider => 'upstart',
+
+ # We declare the service, but override its status with
+ # $service_ensure
+ base::service_unit { ['jobrunner', 'jobchron']:
+ systemd => true,
+ upstart => true,
+ service_params => { ensure => $service_ensure },
}
- service { 'jobchron':
- ensure => $service_ensure,
- provider => 'upstart',
- }
file { '/etc/logrotate.d/mediawiki_jobrunner':
source =>
'puppet:///modules/mediawiki/logrotate.d_mediawiki_jobrunner',
diff --git a/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
b/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
new file mode 100644
index 0000000..fb9a196
--- /dev/null
+++ b/modules/mediawiki/templates/initscripts/jobchron.systemd.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description "Mediawiki job queue chron loop"
+After=hhvm.service
+
+[Service]
+EnvironmentFile="/etc/default/jobrunner"
+ExecStartPre=/bin/mkdir -p -m 0755 /var/log/mediawiki
+User=$JOBRUNNER_USER
+Group=$JOBRUNNER_GROUP
+ExecStart=/usr/bin/php
/srv/deployment/jobrunner/jobrunner/redisJobChronService
--config-file=$JOBRUNNER_CONFIG $DAEMON_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/mediawiki/files/jobchron.conf
b/modules/mediawiki/templates/initscripts/jobchron.upstart.erb
similarity index 100%
rename from modules/mediawiki/files/jobchron.conf
rename to modules/mediawiki/templates/initscripts/jobchron.upstart.erb
diff --git a/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
b/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
new file mode 100644
index 0000000..c18537a
--- /dev/null
+++ b/modules/mediawiki/templates/initscripts/jobrunner.systemd.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description "Mediawiki job queue runner loop"
+After=hhvm.service
+
+[Service]
+EnvironmentFile="/etc/default/jobrunner"
+ExecStartPre=/bin/mkdir -p -m 0755 /var/log/mediawiki
+User=$JOBRUNNER_USER
+Group=$JOBRUNNER_GROUP
+ExecStart=/usr/bin/php
/srv/deployment/jobrunner/jobrunner/redisJobRunnerService
--config-file=$JOBRUNNER_CONFIG $DAEMON_OPTS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/modules/mediawiki/files/jobrunner.conf
b/modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
similarity index 100%
rename from modules/mediawiki/files/jobrunner.conf
rename to modules/mediawiki/templates/initscripts/jobrunner.upstart.erb
--
To view, visit https://gerrit.wikimedia.org/r/294255
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5368758a4dd799a7651684bbe0dc00d77728c3cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
