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

use amazon steps from master

This commit is contained in:
Matthew Hooker 2018-01-22 17:50:40 -08:00
parent aa667577a5
commit eafda52411
No known key found for this signature in database
GPG Key ID: 7B5F933D9CE8C6A1
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builder/amazon/common/step_run_source_instance.go
View File

@ -179,17 +179,7 @@ func (s *StepRunSourceInstance) Run(_ context.Context, state multistep.StateBag)
describeInstance := &ec2.DescribeInstancesInput{ describeInstance := &ec2.DescribeInstancesInput{
InstanceIds: []*string{aws.String(instanceId)}, InstanceIds: []*string{aws.String(instanceId)},
} }
ctx, cancel := context.WithCancel(context.Background()) if err := ec2conn.WaitUntilInstanceRunning(describeInstance); err != nil {
go func() {
for {
if _, ok := state.GetOk(multistep.StateCancelled); ok {
cancel()
}
}
}()
if err := ec2conn.WaitUntilInstanceRunningWithContext(ctx, describeInstance); err != nil {
err := fmt.Errorf("Error waiting for instance (%s) to become ready: %s", instanceId, err) err := fmt.Errorf("Error waiting for instance (%s) to become ready: %s", instanceId, err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())