From 526d62ee1bd48c01ced986a3f722d97d82333098 Mon Sep 17 00:00:00 2001
From: Ben Mangold <1518509+benmangold@users.noreply.github.com>
Date: Sun, 27 Sep 2020 18:53:09 -0400
Subject: [PATCH] (bugfix) ohmyzsh installation errors (#2)

---
 scripts/ansible.sh        | 4 ++--
 tasks/tools/oh-my-zsh.yml | 4 +---
 terraform/main.tf         | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/ansible.sh b/scripts/ansible.sh
index b151a09..e333837 100755
--- a/scripts/ansible.sh
+++ b/scripts/ansible.sh
@@ -10,7 +10,7 @@
 
 if [[ -z "$TF_VAR_instance_name" ]]; then
     echo "Must provide TF_VAR_instance_name in environment" 1>&2
-    echo "Run this script via `make connect`" 1>&2
+    echo "Run this script via `make ansible`" 1>&2
     exit 1
 fi
 
@@ -18,4 +18,4 @@ export PUBLIC_IP=$(aws ec2 describe-instances --filters Name=instance-state-name
 
 echo "$PUBLIC_IP" > "tests/inventory"
 
-ansible-playbook -i ./tests/inventory --private-key ~/.ssh/lemur-pro.pem ./tests/test.yml
+ansible-playbook -i ./tests/inventory --private-key ~/.ssh/lemur-pro.pem -e ansible_python_interpreter=/usr/bin/python3 ./tests/test.yml
diff --git a/tasks/tools/oh-my-zsh.yml b/tasks/tools/oh-my-zsh.yml
index 46496f2..d31220b 100644
--- a/tasks/tools/oh-my-zsh.yml
+++ b/tasks/tools/oh-my-zsh.yml
@@ -11,9 +11,7 @@
   user: name={{ user }} shell={{ zsh_path.stdout }}
 
 - name: Install oh-my-zsh
-  shell: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-  async: 15
-  poll: 5
+  shell: "curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh"
   become_user: "{{ user }}"
   args:
     creates: "/home/{{ user }}/.oh-my-zsh"
diff --git a/terraform/main.tf b/terraform/main.tf
index 6b48594..da3afd9 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -35,7 +35,7 @@ data "aws_ami" "ubuntu" {
 
   filter {
     name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"]
+    values = ["ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"]
   }
 
   filter {