jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398781 )
Change subject: jobcron: fix variable scope resolution
......................................................................
jobcron: fix variable scope resolution
The @dir variable is not being looked up correctly under Puppet4. Using
the `scope` resolution operator and the absolute variable name seems to
work correctly.
Change-Id: Ic5abb5d05daa789199ef538528747db7a9b24fcd
---
M puppet/modules/mediawiki/templates/systemd/jobchron.erb
M puppet/modules/mediawiki/templates/systemd/jobrunner.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/templates/systemd/jobchron.erb
b/puppet/modules/mediawiki/templates/systemd/jobchron.erb
index ba1f0df..f1de5dc 100644
--- a/puppet/modules/mediawiki/templates/systemd/jobchron.erb
+++ b/puppet/modules/mediawiki/templates/systemd/jobchron.erb
@@ -8,7 +8,7 @@
User=www-data
Group=www-data
SyslogIdentifier=jobchron
-ExecStart=/usr/bin/php7.0 <%= @dir %>/redisJobChronService
--config-file=/etc/jobrunner.json ${DAEMON_OPTS}
+ExecStart=/usr/bin/php7.0 <%= scope['::mediawiki::jobrunner::dir']
%>/redisJobChronService --config-file=/etc/jobrunner.json ${DAEMON_OPTS}
Restart=always
[Install]
diff --git a/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
b/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
index 2e2c4b2..698d3f2 100644
--- a/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
+++ b/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
@@ -8,7 +8,7 @@
User=www-data
Group=www-data
SyslogIdentifier=jobrunner
-ExecStart=/usr/bin/php7.0 <%= @dir %>/redisJobRunnerService
--config-file=/etc/jobrunner.json ${DAEMON_OPTS}
+ExecStart=/usr/bin/php7.0 <%= scope['::mediawiki::jobrunner::dir']
%>/redisJobRunnerService --config-file=/etc/jobrunner.json ${DAEMON_OPTS}
Restart=always
[Install]
--
To view, visit https://gerrit.wikimedia.org/r/398781
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5abb5d05daa789199ef538528747db7a9b24fcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
