From 4a13d752ed8f8ff4195e9b1c521f352e6b9d2e31 Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pnoordhuis@vmware.com>
Date: Sun, 12 Oct 2014 16:34:40 -0700
Subject: [PATCH] Copy release tars with scp

This displays a progress report, so any slowness can be attributed.
---
 cluster/vsphere/util.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/cluster/vsphere/util.sh b/cluster/vsphere/util.sh
index 7ea096c7ad7..e2ca662e5a5 100755
--- a/cluster/vsphere/util.sh
+++ b/cluster/vsphere/util.sh
@@ -157,13 +157,14 @@ function find-release-tars {
 #   SERVER_BINARY_TAR
 #   SALT_TAR
 function upload-server-tars {
-  local args="-vm ${MASTER_NAME}"
+  local vm_ip
 
-  govc guest.mkdir ${args} -p /home/kube/cache/kubernetes-install
+  vm_ip=$(govc vm.ip "${MASTER_NAME}")
+  kube-ssh ${vm_ip} "mkdir -p /home/kube/cache/kubernetes-install"
 
   local tar
   for tar in "${SERVER_BINARY_TAR}" "${SALT_TAR}"; do
-    govc guest.upload ${args} -f "${tar}" "/home/kube/cache/kubernetes-install/${tar##*/}"
+    kube-scp ${vm_ip} "${tar}" "/home/kube/cache/kubernetes-install/${tar##*/}"
   done
 }
 
@@ -200,6 +201,14 @@ function kube-ssh {
   ssh ${SSH_OPTS-} "kube@${host}" "$@" 2> /dev/null
 }
 
+# Copy file over ssh
+function kube-scp {
+  local host="$1"
+  local src="$2"
+  local dst="$3"
+  scp ${SSH_OPTS-} "${src}" "kube@${host}:${dst}"
+}
+
 # Instantiate a generic kubernetes virtual machine (master or minion)
 #
 # Usage: