From 889d724c1996e400ce01fcf397644a9df72f36a0 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@gmail.com>
Date: Thu, 23 Jul 2015 20:03:42 -0700
Subject: [PATCH] Revert "Fix libvirt-coreos cluster"

---
 cluster/common.sh              | 4 +---
 cluster/libvirt-coreos/util.sh | 7 +++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cluster/common.sh b/cluster/common.sh
index 542a9604ad..cb75be8a19 100755
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -80,9 +80,7 @@ function create-kubeconfig() {
   fi
 
   "${kubectl}" config set-cluster "${CONTEXT}" "${cluster_args[@]}"
-  if [ -n "${user_args[@]:-}" ]; then
-      "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
-  fi
+  "${kubectl}" config set-credentials "${CONTEXT}" "${user_args[@]}"
   "${kubectl}" config set-context "${CONTEXT}" --cluster="${CONTEXT}" --user="${CONTEXT}"
   "${kubectl}" config use-context "${CONTEXT}"  --cluster="${CONTEXT}"
 
diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh
index 828adf995e..0cce224687 100644
--- a/cluster/libvirt-coreos/util.sh
+++ b/cluster/libvirt-coreos/util.sh
@@ -200,6 +200,7 @@ function wait-cluster-readiness {
 function kube-up {
   detect-master
   detect-minions
+  get-password
   initialize-pool keep_base_image
   initialize-network
 
@@ -327,6 +328,12 @@ function test-teardown {
   kube-down
 }
 
+# Set the {KUBE_USER} and {KUBE_PASSWORD} environment values required to interact with provider
+function get-password {
+  export KUBE_USER=''
+  export KUBE_PASSWORD=''
+}
+
 # SSH to a node by name or IP ($1) and run a command ($2).
 function ssh-to-node {
   local node="$1"