C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use bin_dir var in init scripts

Browse source
This commit is contained in:
Smaine Kahlouch 2016-01-04 14:35:01 +01:00
parent d172457504
commit 99d16913d3
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/node/templates/rh-kubelet.initd.j2
View file

@ -22,7 +22,7 @@
. /etc/rc.d/init.d/functions . /etc/rc.d/init.d/functions
prog="kubelet" prog="kubelet"
exec="/usr/local/bin/$prog" exec="{{ bin_dir }}/$prog"
pidfile="/var/run/$prog.pid" pidfile="/var/run/$prog.pid"
lockfile="/var/lock/subsys/$prog" lockfile="/var/lock/subsys/$prog"
logfile="/var/log/$prog" logfile="/var/log/$prog"

2
roles/network_plugin/templates/calico/deb-calico.initd.j2
View file

@ -14,7 +14,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Calico-node Docker" DESC="Calico-node Docker"
NAME=calico-node NAME=calico-node
DAEMON=/usr/local/bin/calicoctl DAEMON={{ bin_dir }}/calicoctl
DAEMON_ARGS="" DAEMON_ARGS=""
DOCKER=$(which docker) DOCKER=$(which docker)
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME

2
roles/network_plugin/templates/calico/rh-calico.initd.j2
View file

@ -22,7 +22,7 @@
. /etc/rc.d/init.d/functions . /etc/rc.d/init.d/functions
prog="calicoctl" prog="calicoctl"
exec="/usr/local/bin/$prog" exec="{{ bin_dir }}/$prog"
dockerexec="$(which docker)" dockerexec="$(which docker)"
logfile="/var/log/$prog" logfile="/var/log/$prog"