summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-04-26 21:45:15 +0200
committerColleen Murphy <colleen@gazlene.net>2018-04-26 21:45:46 +0200
commitbb2f9fc027bfc5ae09aa861b005c707e6681e960 (patch)
tree6525311f2b5a0ffe238029c84e46eadd65eb967b
parent22284188fb43f6a053ed1f2e9496bcda028413f4 (diff)
Use instance variables in puppet template
Using local ruby variables in puppet ERB templates was deprecated in puppet 3 and doesn't work any more in puppet 4. Access these values as ruby instance variables instead. Change-Id: I6ea7b30d7a890b73f8a4ce6572751d0ecfb35667
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Joshua Hesketh <josh@nitrotech.org> Workflow+1: Joshua Hesketh <josh@nitrotech.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 01 May 2018 12:31:14 +0000 Reviewed-on: https://review.openstack.org/564606 Project: openstack-infra/puppet-subunit2sql Branch: refs/heads/master
-rwxr-xr-xtemplates/jenkins-subunit-worker.init.erb6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/jenkins-subunit-worker.init.erb b/templates/jenkins-subunit-worker.init.erb
index f77376a..bbb3288 100755
--- a/templates/jenkins-subunit-worker.init.erb
+++ b/templates/jenkins-subunit-worker.init.erb
@@ -1,6 +1,6 @@
1#! /bin/sh 1#! /bin/sh
2### BEGIN INIT INFO 2### BEGIN INIT INFO
3# Provides: jenkins-subunit-worker<%= suffix %> 3# Provides: jenkins-subunit-worker<%= @suffix %>
4# Required-Start: $remote_fs $syslog 4# Required-Start: $remote_fs $syslog
5# Required-Stop: $remote_fs $syslog 5# Required-Stop: $remote_fs $syslog
6# Default-Start: 2 3 4 5 6# Default-Start: 2 3 4 5
@@ -14,10 +14,10 @@
14# PATH should only include /usr/* if it runs after the mountnfs.sh script 14# PATH should only include /usr/* if it runs after the mountnfs.sh script
15PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin 15PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
16DESC="Jenkins Subunit Worker" 16DESC="Jenkins Subunit Worker"
17NAME=jenkins-subunit-worker<%= suffix %> 17NAME=jenkins-subunit-worker<%= @suffix %>
18DAEMON=/usr/local/bin/subunit-gearman-worker.py 18DAEMON=/usr/local/bin/subunit-gearman-worker.py
19PIDFILE=/var/run/$NAME/$NAME.pid 19PIDFILE=/var/run/$NAME/$NAME.pid
20DAEMON_ARGS="-c /etc/subunit2sql/jenkins-subunit-worker<%= suffix %>.yaml -d /var/log/subunit2sql/subunit-worker<%= suffix %>-debug.log -p $PIDFILE" 20DAEMON_ARGS="-c /etc/subunit2sql/jenkins-subunit-worker<%= @suffix %>.yaml -d /var/log/subunit2sql/subunit-worker<%= @suffix %>-debug.log -p $PIDFILE"
21SCRIPTNAME=/etc/init.d/$NAME 21SCRIPTNAME=/etc/init.d/$NAME
22USER=subunit 22USER=subunit
23 23