From bb2f9fc027bfc5ae09aa861b005c707e6681e960 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 26 Apr 2018 21:45:15 +0200
Subject: [PATCH] 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
---
 templates/jenkins-subunit-worker.init.erb | 6 +++---
 1 file 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 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          jenkins-subunit-worker<%= suffix %>
+# Provides:          jenkins-subunit-worker<%= @suffix %>
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
@@ -14,10 +14,10 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 DESC="Jenkins Subunit Worker"
-NAME=jenkins-subunit-worker<%= suffix %>
+NAME=jenkins-subunit-worker<%= @suffix %>
 DAEMON=/usr/local/bin/subunit-gearman-worker.py
 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
 USER=subunit