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

builder/vmware: break out the proper loop

This commit is contained in:
Mitchell Hashimoto 2013-06-08 19:26:07 -07:00
parent ccfb4664cf
commit c29d754fa8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builder/amazonebs/builder_test.go
View File

@ -7,12 +7,12 @@ import (
func testConfig() map[string]interface{} { func testConfig() map[string]interface{} {
return map[string]interface{}{ return map[string]interface{}{
"access_key": "foo", "access_key": "foo",
"secret_key": "bar", "secret_key": "bar",
"source_ami": "foo", "source_ami": "foo",
"instance_type": "foo", "instance_type": "foo",
"region": "us-east-1", "region": "us-east-1",
"ssh_username": "root", "ssh_username": "root",
} }
} }

3
builder/vmware/step_wait_for_ssh.go
View File

@ -45,6 +45,7 @@ func (s *stepWaitForSSH) Run(state map[string]interface{}) multistep.StepAction
log.Printf("Waiting for SSH, up to timeout: %s", config.SSHWaitTimeout.String()) log.Printf("Waiting for SSH, up to timeout: %s", config.SSHWaitTimeout.String())
timeout := time.After(config.SSHWaitTimeout) timeout := time.After(config.SSHWaitTimeout)
WaitLoop:
for { for {
// Wait for either SSH to become available, a timeout to occur, // Wait for either SSH to become available, a timeout to occur,
// or an interrupt to come through. // or an interrupt to come through.
@ -56,7 +57,7 @@ func (s *stepWaitForSSH) Run(state map[string]interface{}) multistep.StepAction
} }
state["communicator"] = comm state["communicator"] = comm
break break WaitLoop
case <-timeout: case <-timeout:
ui.Error("Timeout waiting for SSH.") ui.Error("Timeout waiting for SSH.")
s.cancel = true s.cancel = true