From b6aed3fec3318f720a4182a3740a919fc9141afe Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Thu, 12 Nov 2015 16:00:28 -0600 Subject: [PATCH] communicator/ssh: fix typos travis didn't catch I think rebasing and splitting got me into a weird state. This should fix the build failures on master. --- communicator/ssh/provisioner.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/communicator/ssh/provisioner.go b/communicator/ssh/provisioner.go index a45c9345f..f9f889037 100644 --- a/communicator/ssh/provisioner.go +++ b/communicator/ssh/provisioner.go @@ -98,10 +98,10 @@ func parseConnectionInfo(s *terraform.InstanceState) (*connectionInfo, error) { // Load deprecated fields; we can handle either path or contents in // underlying implementation. if connInfo.PrivateKey == "" && connInfo.KeyFile != "" { - connInfo.PrivateKey = conninfo.KeyFile + connInfo.PrivateKey = connInfo.KeyFile } if connInfo.BastionPrivateKey == "" && connInfo.BastionKeyFile != "" { - connInfo.BastionPrivateKey = conninfo.BastionKeyFile + connInfo.BastionPrivateKey = connInfo.BastionKeyFile } // Default all bastion config attrs to their non-bastion counterparts @@ -192,7 +192,7 @@ func buildSSHClientConfig(opts sshClientConfigOpts) (*ssh.ClientConfig, error) { User: opts.user, } - if opts.keyFile != "" { + if opts.privateKey != "" { pubKeyAuth, err := readPrivateKey(opts.privateKey) if err != nil { return nil, err