Commit bdac2a87 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

Update CHANGELOG

parent 7a9109d2
...@@ -7,6 +7,7 @@ FEATURES: ...@@ -7,6 +7,7 @@ FEATURES:
IMPROVEMENTS: IMPROVEMENTS:
* amazon-ebs: Verify the source AMI is EBS-backed before launching. [GH-169]
* vmware: error if shutdown command has non-zero exit status. * vmware: error if shutdown command has non-zero exit status.
BUG FIXES: BUG FIXES:
......
...@@ -28,23 +28,20 @@ func (s *stepRunSourceInstance) Run(state map[string]interface{}) multistep.Step ...@@ -28,23 +28,20 @@ func (s *stepRunSourceInstance) Run(state map[string]interface{}) multistep.Step
SecurityGroups: []ec2.SecurityGroup{ec2.SecurityGroup{Id: securityGroupId}}, SecurityGroups: []ec2.SecurityGroup{ec2.SecurityGroup{Id: securityGroupId}},
} }
ui.Say("Validating Source AMI...") ui.Say("Launching a source AWS instance...")
imageResp, err := ec2conn.Images([]string{config.SourceAmi}, ec2.NewFilter()) imageResp, err := ec2conn.Images([]string{config.SourceAmi}, ec2.NewFilter())
if err != nil { if err != nil {
err := fmt.Errorf("There was a problem with the provided source AMI: %s", err) state["error"] = fmt.Errorf("There was a problem with the source AMI: %s", err)
state["error"] = err return multistep.ActionHalt
ui.Error(err.Error()) }
return multistep.ActionHalt
}
if imageResp.Images[0].RootDeviceType != "ebs" { if imageResp.Images[0].RootDeviceType != "ebs" {
err := fmt.Errorf("The provided source AMI is instance-store based. The amazon-ebs bundler can only work with EBS based AMIs.") state["error"] = fmt.Errorf(
state["error"] = err "The provided source AMI is instance-store based. The\n" +
ui.Error(err.Error()) "amazon-ebs bundler can only work with EBS based AMIs.")
return multistep.ActionHalt return multistep.ActionHalt
} }
ui.Say("Launching a source AWS instance...")
runResp, err := ec2conn.RunInstances(runOpts) runResp, err := ec2conn.RunInstances(runOpts)
if err != nil { if err != nil {
err := fmt.Errorf("Error launching source instance: %s", err) err := fmt.Errorf("Error launching source instance: %s", err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment