From 99d16913d3968dc9ecc162325e6f92681de78262 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Mon, 4 Jan 2016 14:35:01 +0100
Subject: [PATCH] use bin_dir var in init scripts
---
roles/kubernetes/node/templates/rh-kubelet.initd.j2 | 2 +-
roles/network_plugin/templates/calico/deb-calico.initd.j2 | 2 +-
roles/network_plugin/templates/calico/rh-calico.initd.j2 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes/node/templates/rh-kubelet.initd.j2 b/roles/kubernetes/node/templates/rh-kubelet.initd.j2
index 2394b515d..95666afde 100644
--- 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"
diff --git a/roles/network_plugin/templates/calico/deb-calico.initd.j2 b/roles/network_plugin/templates/calico/deb-calico.initd.j2
index a71e03cfc..cd66de53f 100644
--- 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
diff --git a/roles/network_plugin/templates/calico/rh-calico.initd.j2 b/roles/network_plugin/templates/calico/rh-calico.initd.j2
index 5aa1ee9fa..d4f798f56 100644
--- 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"
--
GitLab