use bin_dir var in init scripts

2016-01-04 14:35:01 +01:00 · 2016-01-04 14:35:01 +01:00 · 99d16913d3
parent d172457504
commit 99d16913d3
3 changed files with 3 additions and 3 deletions
--- a/roles/kubernetes/node/templates/rh-kubelet.initd.j2
+++ b/roles/kubernetes/node/templates/rh-kubelet.initd.j2
@ -22,7 +22,7 @@
 . /etc/rc.d/init.d/functions

 prog="kubelet"
-exec="/usr/local/bin/$prog"
+exec="{{ bin_dir }}/$prog"
 pidfile="/var/run/$prog.pid"
 lockfile="/var/lock/subsys/$prog"
 logfile="/var/log/$prog"
--- a/roles/network_plugin/templates/calico/deb-calico.initd.j2
+++ b/roles/network_plugin/templates/calico/deb-calico.initd.j2
@ -14,7 +14,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Calico-node Docker"
 NAME=calico-node
-DAEMON=/usr/local/bin/calicoctl
+DAEMON={{ bin_dir }}/calicoctl
 DAEMON_ARGS=""
 DOCKER=$(which docker)
 SCRIPTNAME=/etc/init.d/$NAME
--- a/roles/network_plugin/templates/calico/rh-calico.initd.j2
+++ b/roles/network_plugin/templates/calico/rh-calico.initd.j2
@ -22,7 +22,7 @@
 . /etc/rc.d/init.d/functions

 prog="calicoctl"
-exec="/usr/local/bin/$prog"
+exec="{{ bin_dir }}/$prog"
 dockerexec="$(which docker)"
 logfile="/var/log/$prog"