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

Merge pull request #7100 from anish/comm_cleanup

Browse Source 
Better fix for StepCleanupTempKeys #7095
This commit is contained in:
Megan Marsh 2018-12-11 15:51:13 -08:00 committed by GitHub
commit a6956e4f30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/step_cleanup_temp_keys.go
View File

@ -19,13 +19,6 @@ func (s *StepCleanupTempKeys) Run(_ context.Context, state multistep.StateBag) m
// so there's no realistic situation where these keys can cause issues.
// However, it's nice to clean up after yourself.
if s.Comm.Type == "none" {
return multistep.ActionContinue
}
comm := state.Get("communicator").(packer.Communicator)
ui := state.Get("ui").(packer.Ui)
if !s.Comm.SSHClearAuthorizedKeys {
return multistep.ActionContinue
}
@ -38,6 +31,9 @@ func (s *StepCleanupTempKeys) Run(_ context.Context, state multistep.StateBag) m
return multistep.ActionContinue
}
comm := state.Get("communicator").(packer.Communicator)
ui := state.Get("ui").(packer.Ui)
cmd := new(packer.RemoteCmd)
ui.Say("Trying to remove ephemeral keys from authorized_keys files")