builder/amazon use proper key pair name

5c290fdb · Mitchell Hashimoto · 59766067 · 5c290fdb · 5c290fdb
Commit 5c290fdb authored Jun 19, 2015 by Mitchell Hashimoto
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

builder/amazon/ebs/builder.go builder/amazon/ebs/builder.go +1 -1

builder/amazon/instance/builder.go builder/amazon/instance/builder.go +1 -1

No files found.
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -90,7 +90,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&awscommon.StepKeyPair{
 			Debug:                b.config.PackerDebug,
 			DebugKeyPath:         fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
-			KeyPairName:          b.config.TemporaryKeyPairName,
+			KeyPairName:          b.config.SSHKeyPairName,
 			TemporaryKeyPairName: b.config.TemporaryKeyPairName,
 			PrivateKeyFile:       b.config.RunConfig.Comm.SSHPrivateKey,
 		},

--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -179,7 +179,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&awscommon.StepKeyPair{
 			Debug:                b.config.PackerDebug,
 			DebugKeyPath:         fmt.Sprintf("ec2_%s.pem", b.config.PackerBuildName),
-			KeyPairName:          b.config.TemporaryKeyPairName,
+			KeyPairName:          b.config.SSHKeyPairName,
 			PrivateKeyFile:       b.config.RunConfig.Comm.SSHPrivateKey,
 			TemporaryKeyPairName: b.config.TemporaryKeyPairName,
 		},