From df0ca1c54cec8e735a9da7b5819047c9f0929a05 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Tue, 11 Aug 2015 00:34:23 -0400
Subject: [PATCH] Fix vagrant kube-up

---
 cluster/vagrant/config-default.sh   |  3 +++
 cluster/vagrant/config-test.sh      |  3 +++
 cluster/vagrant/provision-master.sh | 28 ++++++++++++++--------------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh
index 6cec037741b..0bd26367cd1 100755
--- a/cluster/vagrant/config-default.sh
+++ b/cluster/vagrant/config-default.sh
@@ -27,6 +27,9 @@ export KUBE_MASTER_IP=${MASTER_IP}
 export INSTANCE_PREFIX="kubernetes"
 export MASTER_NAME="${INSTANCE_PREFIX}-master"
 
+# Should the master serve as a node
+REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
+
 # Map out the IPs, names and container subnets of each minion
 export MINION_IP_BASE=${MINION_IP_BASE-"10.245.1."}
 MINION_CONTAINER_SUBNET_BASE="10.246"
diff --git a/cluster/vagrant/config-test.sh b/cluster/vagrant/config-test.sh
index dbaac9dd35a..8d4ce6a76fa 100644
--- a/cluster/vagrant/config-test.sh
+++ b/cluster/vagrant/config-test.sh
@@ -20,3 +20,6 @@ NUM_MINIONS=2
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source "${KUBE_ROOT}/cluster/vagrant/config-default.sh"
+
+# Do not register the master kubelet during testing
+REGISTER_MASTER_KUBELET=${REGISTER_MASTER:-false}
diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh
index 2d1f99fdf9f..cbf0205edfb 100755
--- a/cluster/vagrant/provision-master.sh
+++ b/cluster/vagrant/provision-master.sh
@@ -172,20 +172,20 @@ if [[ ! -f "${known_tokens_file}" ]]; then
   cat > "${kubelet_kubeconfig_file}" << EOF
 apiVersion: v1
 kind: Config
-users:
-- name: kubelet
-  user:
-    token: ${KUBELET_TOKEN}
 clusters:
-- name: local
-  cluster:
+- cluster:
     insecure-skip-tls-verify: true
+  name: local
 contexts:
-  - context:
+- context:
     cluster: local
     user: kubelet
   name: service-account-context
 current-context: service-account-context
+users:
+- name: kubelet
+  user:
+    token: ${KUBELET_TOKEN}
 EOF
 )
 
@@ -199,20 +199,20 @@ EOF
   cat > "${kube_proxy_kubeconfig_file}" << EOF
 apiVersion: v1
 kind: Config
-users:
-- name: kube-proxy
-  user:
-    token: ${KUBE_PROXY_TOKEN}
 clusters:
-- name: local
-  cluster:
-     insecure-skip-tls-verify: true
+- cluster:
+    insecure-skip-tls-verify: true
+  name: local
 contexts:
 - context:
     cluster: local
     user: kube-proxy
   name: service-account-context
 current-context: service-account-context
+users:
+- name: kube-proxy
+  user:
+    token: ${KUBE_PROXY_TOKEN}
 EOF
 )