(bugfix) ohmyzsh installation errors (#2)

benmangold · Sep 27, 2020 · 526d62e · 526d62e
1 parent 778ee21
commit 526d62e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/scripts/ansible.sh b/scripts/ansible.sh
@@ -10,12 +10,12 @@
 
 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
 
 export PUBLIC_IP=$(aws ec2 describe-instances --filters Name=instance-state-name,Values=running Name=tag:Name,Values=$TF_VAR_instance_name --region=us-east-2 | jq -r .Reservations[].Instances[].PublicIpAddress)
 
 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
@@ -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
@@ -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 {