Merge pull request #38 from aws/fix/use-capi-machine-name-for-vm-creation

To match node names to machine names, use CAPI machine names when creating CloudStack VMs

Author: wongni

pkg/cloud/instance.go

@@ -156,8 +156,8 @@ func (c *client) GetOrCreateVMInstance(
 	// Create VM instance.
 	p := c.cs.VirtualMachine.NewDeployVirtualMachineParams(offeringID, templateID, csCluster.Status.ZoneID)
 	p.SetNetworkids([]string{csCluster.Status.NetworkID})
-	setIfNotEmpty(csMachine.Name, p.SetName)
-	setIfNotEmpty(csMachine.Name, p.SetDisplayname)
+	setIfNotEmpty(capiMachine.Name, p.SetName)
+	setIfNotEmpty(capiMachine.Name, p.SetDisplayname)
 	setIfNotEmpty(csMachine.Spec.SSHKey, p.SetKeypair)
 
 	compressedAndEncodedUserData, err := CompressAndEncodeString(userData)