From 4136219d8bf79ab9c35c348b27d534656311a7e1 Mon Sep 17 00:00:00 2001
From: Kevin <wangzefeng@huawei.com>
Date: Fri, 4 Dec 2015 02:00:13 +0000
Subject: [PATCH] centos baremetal: fix centos baremetal kube-up failure and
 update default download k8s version to v1.1.1

---
 cluster/centos/config-build.sh | 2 +-
 cluster/centos/util.sh         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/centos/config-build.sh b/cluster/centos/config-build.sh
index 0ec715ddc9f..60ee0f47c9b 100755
--- a/cluster/centos/config-build.sh
+++ b/cluster/centos/config-build.sh
@@ -26,7 +26,7 @@ FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"}
 ETCD_VERSION=${ETCD_VERSION:-"2.2.1"}
 
 # Define k8s version to use.
-K8S_VERSION=${K8S_VERSION:-"1.0.4"}
+K8S_VERSION=${K8S_VERSION:-"1.1.1"}
 
 FLANNEL_DOWNLOAD_URL=\
 "https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz"
diff --git a/cluster/centos/util.sh b/cluster/centos/util.sh
index f6a6fef34e5..71517f11294 100755
--- a/cluster/centos/util.sh
+++ b/cluster/centos/util.sh
@@ -293,7 +293,7 @@ function kube-scp() {
 #   KUBE_USER
 #   KUBE_PASSWORD
 function get-password {
-  get-kubeconfig-basicauth
+  load-or-gen-kube-basicauth
   if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
     KUBE_USER=admin
     KUBE_PASSWORD=$(python -c 'import string,random; \