Merge pull request #7100 from anish/comm_cleanup

Better fix for StepCleanupTempKeys #7095

common/step_cleanup_temp_keys.go

@@ -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")