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

builder.alicloud: stop using config from statebag

This commit is contained in:
Adrien Delorme 2018-08-28 17:56:04 +02:00
parent 4fdf5714a6
commit 1e71712cc9
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/alicloud/ecs/step_config_key_pair.go
View File

@ -25,7 +25,6 @@ type stepConfigAlicloudKeyPair struct {
func (s *stepConfigAlicloudKeyPair) 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")
@ -36,8 +35,8 @@ func (s *stepConfigAlicloudKeyPair) Run(_ context.Context, state multistep.State
return multistep.ActionHalt
}
config.Comm.SSHKeyPairName = s.Comm.SSHKeyPairName
config.Comm.SSHPrivateKey = privateKeyBytes
s.Comm.SSHKeyPairName = s.Comm.SSHKeyPairName
s.Comm.SSHPrivateKey = privateKeyBytes
return multistep.ActionContinue
}
@ -75,8 +74,8 @@ func (s *stepConfigAlicloudKeyPair) Run(_ context.Context, state multistep.State
s.keyName = s.Comm.SSHTemporaryKeyPairName
// Set some state data for use in future steps
config.Comm.SSHKeyPairName = s.keyName
config.Comm.SSHPrivateKey = []byte(keyResp.PrivateKeyBody)
s.Comm.SSHKeyPairName = s.keyName
s.Comm.SSHPrivateKey = []byte(keyResp.PrivateKeyBody)
// If we're in debug mode, output the private key to the working
// directory.