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

builder/googlecompute: enable SSH

This commit is contained in:
Mitchell Hashimoto 2013-12-13 18:06:49 -08:00
parent a72d31fb5b
commit 1055f470e6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/googlecompute/builder.go
View File

@ -4,6 +4,7 @@ package googlecompute
import ( import (
"log" "log"
"time"
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/common" "github.com/mitchellh/packer/common"
@ -51,13 +52,13 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
new(StepCreateSSHKey), new(StepCreateSSHKey),
new(StepCreateInstance), new(StepCreateInstance),
new(StepInstanceInfo), new(StepInstanceInfo),
}
/*
&common.StepConnectSSH{ &common.StepConnectSSH{
SSHAddress: sshAddress, SSHAddress: sshAddress,
SSHConfig: sshConfig, SSHConfig: sshConfig,
SSHWaitTimeout: 5 * time.Minute, SSHWaitTimeout: 5 * time.Minute,
}, },
}
/*
new(common.StepProvision), new(common.StepProvision),
new(stepUpdateGsutil), new(stepUpdateGsutil),
new(stepCreateImage), new(stepCreateImage),

2
builder/googlecompute/ssh.go
View File

@ -24,9 +24,11 @@ func sshConfig(state multistep.StateBag) (*gossh.ClientConfig, error) {
if err := keyring.AddPEMKey(privateKey); err != nil { if err := keyring.AddPEMKey(privateKey); err != nil {
return nil, fmt.Errorf("Error setting up SSH config: %s", err) return nil, fmt.Errorf("Error setting up SSH config: %s", err)
} }
sshConfig := &gossh.ClientConfig{ sshConfig := &gossh.ClientConfig{
User: config.SSHUsername, User: config.SSHUsername,
Auth: []gossh.ClientAuth{gossh.ClientAuthKeyring(keyring)}, Auth: []gossh.ClientAuth{gossh.ClientAuthKeyring(keyring)},
} }
return sshConfig, nil return sshConfig, nil
} }