Merge pull request #5173 from rickard-von-essen/cloudstack-fixes

cloudstack: Move ipaddress, host port, and source to statebag

builder/cloudstack/step_create_instance.go

@@ -37,7 +37,7 @@ func (s *stepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
 	// Create a new parameter struct.
 	p := client.VirtualMachine.NewDeployVirtualMachineParams(
 		config.ServiceOffering,
-		config.instanceSource,
+		state.Get("source").(string),
 		config.Zone,
 	)
 
@@ -140,7 +140,7 @@ func (s *stepCreateInstance) Run(state multistep.StateBag) multistep.StepAction
 
 	// Set the host address when using the local IP address to connect.
 	if config.UseLocalIPAddress {
-		config.hostAddress = instance.Nic[0].Ipaddress
+		state.Put("ipaddress", instance.Nic[0].Ipaddress)
 	}
 
 	// Store the instance ID so we can remove it later.