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

Fix use of auto generated ssh key for scaleway builder

This commit is contained in:
DanHam 2018-05-03 11:33:28 +01:00
parent 585b93cfd6
commit c47e5d19f0
No known key found for this signature in database
GPG Key ID: 58E79AEDD6AA987E
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builder/scaleway/ssh.go
View File

@ -18,7 +18,6 @@ func commHost(state multistep.StateBag) (string, error) {
func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) { func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
config := state.Get("config").(Config) config := state.Get("config").(Config)
var privateKey string
var auth []ssh.AuthMethod var auth []ssh.AuthMethod
@ -45,11 +44,9 @@ func sshConfig(state multistep.StateBag) (*ssh.ClientConfig, error) {
) )
} }
if config.Comm.SSHPrivateKey != "" { // Use key based auth if there is a private key in the state bag
if priv, ok := state.GetOk("private_key"); ok { if privateKey, ok := state.GetOk("private_key"); ok {
privateKey = priv.(string) signer, err := ssh.ParsePrivateKey([]byte(privateKey.(string)))
}
signer, err := ssh.ParsePrivateKey([]byte(privateKey))
if err != nil { if err != nil {
return nil, fmt.Errorf("Error setting up SSH config: %s", err) return nil, fmt.Errorf("Error setting up SSH config: %s", err)
} }