iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/amazon/ebs: clean up AMI in error [GH-1186]

Browse Source
This commit is contained in:
Mitchell Hashimoto 2014-09-06 10:12:33 -07:00
parent 669f26a108
commit a587bd47a1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -63,6 +63,7 @@ BUG FIXES:
* builder/amazon-chroot: Fix crash in root device check. [GH-1360] * builder/amazon-chroot: Fix crash in root device check. [GH-1360]
* builder/amazon-chroot: Add description that Packer made the snapshot * builder/amazon-chroot: Add description that Packer made the snapshot
with a time. [GH-1388] with a time. [GH-1388]
* builder/amazon-ebs: AMI is deregistered if an error. [GH-1186]
* builder/amazon-instance: Fix deprecation warning for `ec2-bundle-vol` * builder/amazon-instance: Fix deprecation warning for `ec2-bundle-vol`
[GH-1424] [GH-1424]
* builder/amazon-instance: Add `--no-filter` to the `ec2-bundle-vol` * builder/amazon-instance: Add `--no-filter` to the `ec2-bundle-vol`

7
builder/amazon/ebs/step_create_ami.go
View File

@ -69,14 +69,17 @@ func (s *stepCreateAMI) Run(state multistep.StateBag) multistep.StepAction {
} }
func (s *stepCreateAMI) Cleanup(state multistep.StateBag) { func (s *stepCreateAMI) Cleanup(state multistep.StateBag) {
if s.image == nil || s.image.State == "available" { _, cancelled := state.GetOk(multistep.StateCancelled)
_, halted := state.GetOk(multistep.StateHalted)
if !cancelled && !halted {
return return
} }
ec2conn := state.Get("ec2").(*ec2.EC2) ec2conn := state.Get("ec2").(*ec2.EC2)
ui := state.Get("ui").(packer.Ui) ui := state.Get("ui").(packer.Ui)
ui.Say("Deregistering the AMI ...") ui.Say("Deregistering the AMI because cancelation or error...")
if resp, err := ec2conn.DeregisterImage(s.image.Id); err != nil { if resp, err := ec2conn.DeregisterImage(s.image.Id); err != nil {
ui.Error(fmt.Sprintf("Error deregistering AMI, may still be around: %s", err)) ui.Error(fmt.Sprintf("Error deregistering AMI, may still be around: %s", err))
return return