From 1c294549c1365eb5d9ee3a49a722b2a9ff1c956e Mon Sep 17 00:00:00 2001
From: Karan Goel <karangoel@google.com>
Date: Mon, 11 Jun 2018 10:51:02 -0700
Subject: [PATCH] Update vsphere README for machineset

---
 clusterctl/examples/vsphere/README.md         | 10 +++++--
 .../examples/vsphere/machines.yaml.template   | 27 +------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/clusterctl/examples/vsphere/README.md b/clusterctl/examples/vsphere/README.md
index f0d3e71ccac2..df0853df51bf 100644
--- a/clusterctl/examples/vsphere/README.md
+++ b/clusterctl/examples/vsphere/README.md
@@ -11,12 +11,18 @@ For convenience, a generation script which populates templates where possible.
 ./generate-yaml.sh
 ```
 2. Copy machines.yaml.template to machines.yaml and
-Manually edit ```terraformVariables``` for machines in machines.yaml
+Manually edit ```machineVariables``` for machines in machines.yaml
 ```
 cp machines.yaml.template machines.yaml
 ```
 
-3. Copy cluster.yaml.template to cluster.yaml and
+3. Copy machineset.yaml.template to machineset.yaml and
+Manually edit ```machineVariables``` for machines in machineset.yaml
+```
+cp machineset.yaml.template machineset.yaml
+```
+
+4. Copy cluster.yaml.template to cluster.yaml and
 Manually edit ```providerConfig``` for the cluster in cluster.yaml
 ```
 cp cluster.yaml.template cluster.yaml
diff --git a/clusterctl/examples/vsphere/machines.yaml.template b/clusterctl/examples/vsphere/machines.yaml.template
index 9a05eddd31c9..3c553ea7003c 100644
--- a/clusterctl/examples/vsphere/machines.yaml.template
+++ b/clusterctl/examples/vsphere/machines.yaml.template
@@ -2,7 +2,7 @@ items:
 - apiVersion: "cluster.k8s.io/v1alpha1"
   kind: Machine
   metadata:
-    generateName: tf-master-
+    generateName: vs-master-
     labels:
       set: master
   spec:
@@ -27,28 +27,3 @@ items:
       controlPlane: 1.10.1
     roles:
     - Master
-- apiVersion: "cluster.k8s.io/v1alpha1"
-  kind: Machine
-  metadata:
-    generateName: tf-node-
-  spec:
-    providerConfig:
-      value:
-        apiVersion: "vsphereproviderconfig/v1alpha1"
-        kind: "VsphereMachineProviderConfig"
-        vsphereMachine: "standard-node"
-        machineVariables:
-          datacenter: ""
-          datastore: ""
-          resource_pool: ""
-          network: ""
-          num_cpus: "2"
-          memory: "2048"
-          vm_template: ""
-          disk_label: ""
-          disk_size: ""
-          virtual_machine_domain: ""
-    versions:
-      kubelet: 1.10.1
-    roles:
-    - Node