From 92525a3bcaa2b7a92aa2e02c80729cdb49287f1a Mon Sep 17 00:00:00 2001
From: Defunct <defunct@defunct.io>
Date: Sun, 13 Nov 2016 18:44:41 +0000
Subject: [PATCH] resolves #126 - incorrect private key usage w/o ssh-agent

---
 algo                           | 8 ++++----
 roles/cloud-ec2/tasks/main.yml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/algo b/algo
index eba3eb42..8eeb05af 100755
--- a/algo
+++ b/algo
@@ -105,10 +105,10 @@ Note: Make sure to use either your root key (recommended) or an IAM user with an
 
 
   read -p "
-Enter the local path to your SSH public key (~/.ssh/id_rsa.pub): " -r ssh_public_key_file
-ssh_public_key=${ssh_public_key_file:-$HOME/.ssh/id_rsa.pub}
+Enter the local path to your SSH public key (~/.ssh/id_rsa.pub): " -r ssh_public_key
+  ssh_public_key=${ssh_public_key:-$HOME/.ssh/id_rsa.pub}
 
-  read -p "
+read -p "
 Name the vpn server:
 [algo]: " -r aws_server_name
   aws_server_name=${aws_server_name:-algo}
@@ -157,7 +157,7 @@ Enter the local path to your credentials JSON file (https://support.google.com/c
 
   read -p "
 Enter the local path to your SSH public key (~/.ssh/id_rsa.pub): " -r ssh_public_key
-ssh_public_key=${ssh_public_key_file:-$HOME/.ssh/id_rsa.pub}
+  ssh_public_key=${ssh_public_key:-$HOME/.ssh/id_rsa.pub}
 
   read -p "
 Name the vpn server:
diff --git a/roles/cloud-ec2/tasks/main.yml b/roles/cloud-ec2/tasks/main.yml
index e2b0a65c..4b8de61e 100644
--- a/roles/cloud-ec2/tasks/main.yml
+++ b/roles/cloud-ec2/tasks/main.yml
@@ -66,6 +66,7 @@
 - name: Add new instance to host group
   add_host:
     hostname: "{{ item.public_ip }}"
+    ansible_ssh_private_key_file: "{{ ssh_public_key[:-4] }}"
     groupname: vpn-host
     ansible_ssh_user: ubuntu
     ansible_python_interpreter: "/usr/bin/python2.7"