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

scaleway: stop using config from statebag

This commit is contained in:
Adrien Delorme 2018-08-30 17:58:09 +02:00
parent d159c0900b
commit cbbfc6630d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builder/scaleway/step_create_ssh_key.go
View File

@ -27,7 +27,6 @@ type stepCreateSSHKey struct {
func (s *stepCreateSSHKey) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
ui := state.Get("ui").(packer.Ui)
config := state.Get("config").(*Config)
if s.Comm.SSHPrivateKeyFile != "" {
ui.Say("Using existing SSH private key")
@ -38,8 +37,8 @@ func (s *stepCreateSSHKey) Run(_ context.Context, state multistep.StateBag) mult
return multistep.ActionHalt
}
config.Comm.SSHPrivateKey = privateKeyBytes
config.Comm.SSHPublicKey = nil
s.Comm.SSHPrivateKey = privateKeyBytes
s.Comm.SSHPublicKey = nil
return multistep.ActionContinue
}
@ -63,7 +62,7 @@ func (s *stepCreateSSHKey) Run(_ context.Context, state multistep.StateBag) mult
}
// Set the private key in the config for later
config.Comm.SSHPrivateKey = pem.EncodeToMemory(&priv_blk)
s.Comm.SSHPrivateKey = pem.EncodeToMemory(&priv_blk)
pub, _ := ssh.NewPublicKey(&priv.PublicKey)
pub_sshformat := ssh.MarshalAuthorizedKey(pub)
@ -72,7 +71,7 @@ func (s *stepCreateSSHKey) Run(_ context.Context, state multistep.StateBag) mult
log.Printf("temporary ssh key created")
// Remember some state for the future
config.Comm.SSHPublicKey = pub_sshformat
s.Comm.SSHPublicKey = pub_sshformat
// If we're in debug mode, output the private key to the working directory.
if s.Debug {