From 2cb9b32acfbaa45d862cd6877297f52c8098b25c Mon Sep 17 00:00:00 2001
From: Matthew Hooker <mwhooker@gmail.com>
Date: Sun, 26 Feb 2017 17:38:22 -0800
Subject: [PATCH] don't attempt to delete non-existant key when using agent
 auth

---
 builder/amazon/common/step_key_pair.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go
index ed3890374..c5e3ff13a 100644
--- a/builder/amazon/common/step_key_pair.go
+++ b/builder/amazon/common/step_key_pair.go
@@ -107,7 +107,7 @@ func (s *StepKeyPair) Cleanup(state multistep.StateBag) {
 	// If no key name is set, then we never created it, so just return
 	// If we used an SSH private key file, do not go about deleting
 	// keypairs
-	if s.PrivateKeyFile != "" || s.KeyPairName != "" {
+	if s.PrivateKeyFile != "" || (s.KeyPairName == "" && s.keyName == "") {
 		return
 	}