Standardize how we refer to the kubernetes root.

Now use $KUBE_ROOT as the variable pretty much everywhere.
This commit is contained in:
Joe Beda
2014-10-03 14:58:49 -07:00
parent 38d5906044
commit d43a6ec5a3
42 changed files with 172 additions and 156 deletions

View File

@@ -16,7 +16,8 @@
# exit on any error
set -e
source $(dirname $0)/provision-config.sh
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/vagrant/provision-config.sh"
MINION_IP=$4
@@ -30,11 +31,11 @@ fi
minion_ip_array=(${MINION_IPS//,/ })
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
minion=${MINION_NAMES[$i]}
ip=${minion_ip_array[$i]}
ip=${minion_ip_array[$i]}
if [ ! "$(cat /etc/hosts | grep $minion)" ]; then
echo "Adding $minion to hosts file"
echo "$ip $minion" >> /etc/hosts
fi
fi
done
# Let the minion know who its master is
@@ -61,4 +62,4 @@ if ! which salt-minion >/dev/null 2>&1; then
fi
# run the networking setup
$(dirname $0)/provision-network.sh $@
"${KUBE_ROOT}/cluster/vagrant/provision-network.sh" $@