From 62f5cf3e55150d4818a813275dab854fa88d593d Mon Sep 17 00:00:00 2001
From: Craig Barrett <craig.barrett@outreach.io>
Date: Tue, 17 Jan 2017 09:37:24 -0800
Subject: [PATCH] Bugfixes: ensure proper region for register-image cmd and fix
 mismatch on temp_dir between script and vars file

---
 playbooks/build-ami.yml  | 3 +--
 playbooks/group_vars/all | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/playbooks/build-ami.yml b/playbooks/build-ami.yml
index 8ce02e4..cd526a0 100644
--- a/playbooks/build-ami.yml
+++ b/playbooks/build-ami.yml
@@ -30,6 +30,7 @@
     # TODO: handle case where AMI name already exists
     - name: Register AMI from
       command: aws ec2 register-image
+               --region {{ ec2_region }}
                --name '{{ ami_name }}'
                --description '{{ ami_description }}'
                --architecture {{ ami_architecture }}
@@ -52,8 +53,6 @@
           build_user: "{{ ansible_user_id }}"
           build_controller_host: "{{ ansible_hostname }}"
 
-    - fail:
-
     - name: Find local git revision
       command: git rev-parse HEAD
       register: local_git_revision
diff --git a/playbooks/group_vars/all b/playbooks/group_vars/all
index b51282d..98642dd 100644
--- a/playbooks/group_vars/all
+++ b/playbooks/group_vars/all
@@ -1,6 +1,6 @@
 key_pair_name: vyos-build-ami
 ec2_region: us-east-1
-temp_folder: .tmp
+temp_folder: "{{ playbook_dir }}/files/ssh-keys"
 key_pair_file: "{{ temp_folder }}/{{ key_pair_name }}.pem"
 instance_type: t2.medium
 placeholder: vyos-build-ami