opendev/puppet-subunit2sql
Code Issues Proposed changes

Use instance variables in puppet template

Browse Source 
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
This commit is contained in:
Colleen Murphy 2018-04-26 21:45:15 +02:00
parent 22284188fb
commit bb2f9fc027
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/jenkins-subunit-worker.init.erb
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: jenkins-subunit-worker<%= suffix %> # Provides: jenkins-subunit-worker<%= @suffix %>
# Required-Start: $remote_fs $syslog # Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog # Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
@ -14,10 +14,10 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script # PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
DESC="Jenkins Subunit Worker" DESC="Jenkins Subunit Worker"
NAME=jenkins-subunit-worker<%= suffix %> NAME=jenkins-subunit-worker<%= @suffix %>
DAEMON=/usr/local/bin/subunit-gearman-worker.py DAEMON=/usr/local/bin/subunit-gearman-worker.py
PIDFILE=/var/run/$NAME/$NAME.pid PIDFILE=/var/run/$NAME/$NAME.pid
DAEMON_ARGS="-c /etc/subunit2sql/jenkins-subunit-worker<%= suffix %>.yaml -d /var/log/subunit2sql/subunit-worker<%= suffix %>-debug.log -p $PIDFILE" DAEMON_ARGS="-c /etc/subunit2sql/jenkins-subunit-worker<%= @suffix %>.yaml -d /var/log/subunit2sql/subunit-worker<%= @suffix %>-debug.log -p $PIDFILE"
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
USER=subunit USER=subunit