From de72c50a0da7343df3280088b26c52ff17b3c09a Mon Sep 17 00:00:00 2001
From: Miao Luo <miaol@vmware.com>
Date: Thu, 20 Apr 2017 16:31:21 -0700
Subject: [PATCH] Change the default image name for vsphere provider and other
 minor fix.

---
 docs/development/vsphere-dev.md                    | 2 +-
 hack/vsphere/cleanup_env                           | 2 +-
 hack/vsphere/set_env                               | 2 +-
 pkg/model/bootstrapscript.go                       | 5 ++---
 upup/pkg/fi/cloudup/populate_instancegroup_spec.go | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/development/vsphere-dev.md b/docs/development/vsphere-dev.md
index 9db093251f..75cad68633 100644
--- a/docs/development/vsphere-dev.md
+++ b/docs/development/vsphere-dev.md
@@ -94,7 +94,7 @@ export KOPS_STATE_STORE=s3://[s3_bucket]
 export S3_ACCESS_KEY_ID=[s3_access_key]
 export S3_SECRET_ACCESS_KEY=[s3_secret_key]
 export S3_REGION=[s3_region]
-export S3_ENDPOINT=http://[s3_server_ip]:[s3_service_port]
+export S3_ENDPOINT=http://[s3_server_ip]:9000
 ```
 
 Users can also choose their own S3-compatible storage applications by setting environment varibales similiarly.
diff --git a/hack/vsphere/cleanup_env b/hack/vsphere/cleanup_env
index 38abf1c3e3..7e0dc1feb0 100755
--- a/hack/vsphere/cleanup_env
+++ b/hack/vsphere/cleanup_env
@@ -29,7 +29,7 @@ export NODEUP_URL=
 export PROTOKUBE_IMAGE=
 
 echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}"
-echo "DNSCONTROLLER_IMAGE=${VSPHERE_DNSCONTROLLER_IMAGE}"
+echo "DNSCONTROLLER_IMAGE=${DNSCONTROLLER_IMAGE}"
 echo "KOPS_STATE_STORE=${KOPS_STATE_STORE}"
 echo "S3_REGION=${S3_REGION}"
 echo "S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}"
diff --git a/hack/vsphere/set_env b/hack/vsphere/set_env
index 7f682cb494..ac67a47b2b 100755
--- a/hack/vsphere/set_env
+++ b/hack/vsphere/set_env
@@ -48,7 +48,7 @@ export NODEUP_URL=https://storage.googleapis.com/kops-vsphere/nodeup
 export PROTOKUBE_IMAGE=https://storage.googleapis.com/kops-vsphere/protokube.tar.gz
 
 echo "KOPS_FEATURE_FLAGS=${KOPS_FEATURE_FLAGS}"
-echo "DNSCONTROLLER_IMAGE=${VSPHERE_DNSCONTROLLER_IMAGE}"
+echo "DNSCONTROLLER_IMAGE=${DNSCONTROLLER_IMAGE}"
 echo "KOPS_STATE_STORE=${KOPS_STATE_STORE}"
 echo "S3_REGION=${S3_REGION}"
 echo "S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}"
diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go
index 951612c3bf..bafda74518 100644
--- a/pkg/model/bootstrapscript.go
+++ b/pkg/model/bootstrapscript.go
@@ -28,9 +28,8 @@ import (
 
 // BootstrapScript creates the bootstrap script
 type BootstrapScript struct {
-	NodeUpSource     string
-	NodeUpSourceHash string
-
+	NodeUpSource        string
+	NodeUpSourceHash    string
 	NodeUpConfigBuilder func(ig *kops.InstanceGroup) (*nodeup.NodeUpConfig, error)
 }
 
diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
index 790209b5c1..348c06110c 100644
--- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
+++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go
@@ -43,7 +43,7 @@ const (
 	defaultMasterMachineTypeAWS     = "m3.medium"
 	defaultMasterMachineTypeVSphere = "vsphere_master"
 
-	defaultVSphereNodeImage = "ubuntu_16_04"
+	defaultVSphereNodeImage = "kops_ubuntu_16_04.ova"
 )
 
 var masterMachineTypeExceptions = map[string]string{