Commit 3e359491 authored by Ivan Shvedunov's avatar Ivan Shvedunov

Fix error reporting during vagrant provisioning

parent ed3a29bd
...@@ -43,15 +43,6 @@ if [[ -z "$NETWORK_IF_NAME" ]]; then ...@@ -43,15 +43,6 @@ if [[ -z "$NETWORK_IF_NAME" ]]; then
NETWORK_IF_NAME=${DEFAULT_NETWORK_IF_NAME} NETWORK_IF_NAME=${DEFAULT_NETWORK_IF_NAME}
fi fi
function release_not_found() {
echo "It looks as if you don't have a compiled version of Kubernetes. If you" >&2
echo "are running from a clone of the git repo, please run 'make quick-release'." >&2
echo "Note that this requires having Docker installed. If you are running " >&2
echo "from a release tarball, something is wrong. Look at " >&2
echo "http://kubernetes.io/ for information on how to contact the development team for help." >&2
exit 1
}
# Setup hosts file to support ping by hostname to each node in the cluster from apiserver # Setup hosts file to support ping by hostname to each node in the cluster from apiserver
for (( i=0; i<${#NODE_NAMES[@]}; i++)); do for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
node=${NODE_NAMES[$i]} node=${NODE_NAMES[$i]}
......
...@@ -94,6 +94,15 @@ grains: ...@@ -94,6 +94,15 @@ grains:
EOF EOF
} }
function release_not_found() {
echo "It looks as if you don't have a compiled version of Kubernetes. If you" >&2
echo "are running from a clone of the git repo, please run 'make quick-release'." >&2
echo "Note that this requires having Docker installed. If you are running " >&2
echo "from a release tarball, something is wrong. Look at " >&2
echo "http://kubernetes.io/ for information on how to contact the development team for help." >&2
exit 1
}
function install-salt() { function install-salt() {
server_binary_tar="/vagrant/server/kubernetes-server-linux-amd64.tar.gz" server_binary_tar="/vagrant/server/kubernetes-server-linux-amd64.tar.gz"
if [[ ! -f "$server_binary_tar" ]]; then if [[ ! -f "$server_binary_tar" ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment