From cc9fff8e92f4b12269d4c0dbd8b6d3bf59bda9b7 Mon Sep 17 00:00:00 2001
From: He Simei <hesimei@zju.edu.cn>
Date: Wed, 18 Nov 2015 09:59:00 +0800
Subject: [PATCH] fix kube-up workflow

---
 cluster/ubuntu/util.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cluster/ubuntu/util.sh b/cluster/ubuntu/util.sh
index c1e5ca22f57..0c09b27effa 100755
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -267,8 +267,9 @@ EOF
 function detect-master() {
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE:-config-default.sh}"
   setClusterInfo
-  KUBE_MASTER_IP="${MASTER_IP}"
-  echo "Using master $MASTER_IP"
+  export KUBE_MASTER="${MASTER}" 
+  export KUBE_MASTER_IP="${MASTER_IP}"
+  echo "Using master ${MASTER_IP}"
 }
 
 # Detect the information about the nodes
@@ -304,11 +305,11 @@ function detect-nodes() {
 function kube-up() {
   source "${KUBE_ROOT}/cluster/ubuntu/${KUBE_CONFIG_FILE:-config-default.sh}"
 
-  # ensure the binaries are well prepared
-  if [[ ! -f "ubuntu/binaries/master/kube-apiserver" ]]; then
-    echo "No local binaries for kube-up, downloading..."
-    "${KUBE_ROOT}/cluster/ubuntu/download-release.sh"
+  # downloading tarball release
+  if [[ -d "${KUBE_ROOT}/cluster/ubuntu/binaries" ]]; then
+    rm -rf "${KUBE_ROOT}/cluster/ubuntu/binaries"
   fi
+  "${KUBE_ROOT}/cluster/ubuntu/download-release.sh"
 
   setClusterInfo
   local ii=0