From c44cb0830a297bd51f63220e0e12edeff0703f0e Mon Sep 17 00:00:00 2001
From: "Christopher M. Neill" <chris@runnable.com>
Date: Tue, 26 Apr 2016 12:02:03 -0700
Subject: [PATCH 1/3] fix the base.yml, loggly role

---
 ansible/base.yml                    | 25 +++++++++++++++++--------
 ansible/roles/loggly/tasks/main.yml |  2 ++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ansible/base.yml b/ansible/base.yml
index bdc64016..d3f51962 100644
--- a/ansible/base.yml
+++ b/ansible/base.yml
@@ -1,12 +1,21 @@
 ---
-- hosts: "{{ host }}"
+- hosts: localhost
+  connection: local
+  tasks:
+  - fail: msg="`host` (target host) needs to be defined to run this role"
+    when: host is not defined
+
+  - add_host:
+      name={{ host }}
+      groups=dock
+
+- hosts: "{{ host | default('docks') }}"
   roles:
-  - { role: notify, tags: [ notify ], app_name: base_sshd, git_branch: latest, name: base_sshd }
-  - { role: package-dock, tags: [dock, package] }
-  - { role: package-aws, tags: [dock, package] }
+  - { role: package-dock, tags: [ dock, package ] }
+  - { role: package-aws, tags: [ dock, package ] }
   - { role: package_ntp }
-  - { role: docker, tags: [docker] }
-  - { role: datadog, tags: [datadog] }
-  - { role: ulimits, tags: [ulimits] }
-  - { role: loggly, tags: [loggly] }
+  - { role: docker, tags: [ docker ] }
+  - { role: datadog, tags: [ datadog ] }
+  - { role: ulimits, tags: [ ulimits ] }
+  - { role: loggly, tags: [ loggly, clean ] }
   - { role: node }
diff --git a/ansible/roles/loggly/tasks/main.yml b/ansible/roles/loggly/tasks/main.yml
index 1726867b..7f27d6ce 100644
--- a/ansible/roles/loggly/tasks/main.yml
+++ b/ansible/roles/loggly/tasks/main.yml
@@ -47,6 +47,7 @@
     group=syslog
 
 - name: copy app config
+  when: name is defined
   tags: loggly
   become: true
   template:
@@ -70,6 +71,7 @@
   service: name=rsyslog state=stopped
 
 - name: clear rsyslog state file
+  when: name is defined
   tags: [loggly, deploy]
   become: true
   file:

From 59a0ace78423df32861bec790be88552d3c20e24 Mon Sep 17 00:00:00 2001
From: "Christopher M. Neill" <chris@runnable.com>
Date: Tue, 26 Apr 2016 14:05:31 -0700
Subject: [PATCH 2/3] fix build-essential for base.yml

---
 ansible/base.yml                             |  1 +
 ansible/roles/build_essential/tasks/main.yml |  8 ++++----
 ansible/roles/package-dock/tasks/main.yml    | 14 +++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ansible/base.yml b/ansible/base.yml
index d3f51962..a53209c6 100644
--- a/ansible/base.yml
+++ b/ansible/base.yml
@@ -14,6 +14,7 @@
   - { role: package-dock, tags: [ dock, package ] }
   - { role: package-aws, tags: [ dock, package ] }
   - { role: package_ntp }
+  - { role: build_essential }
   - { role: docker, tags: [ docker ] }
   - { role: datadog, tags: [ datadog ] }
   - { role: ulimits, tags: [ ulimits ] }
diff --git a/ansible/roles/build_essential/tasks/main.yml b/ansible/roles/build_essential/tasks/main.yml
index 71471a42..852c4429 100644
--- a/ansible/roles/build_essential/tasks/main.yml
+++ b/ansible/roles/build_essential/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: install build essentials
   become: yes
   action: apt
-    pkg: build-essential
-    state: present
-    update_cache: yes
-    cache_valid_time: 604800
+    pkg=build-essential
+    state=latest
+    update_cache=yes
+    cache_valid_time=604800
diff --git a/ansible/roles/package-dock/tasks/main.yml b/ansible/roles/package-dock/tasks/main.yml
index 6c1dbec3..e6f833c0 100644
--- a/ansible/roles/package-dock/tasks/main.yml
+++ b/ansible/roles/package-dock/tasks/main.yml
@@ -1,6 +1,14 @@
 ---
+- name: Install make
+  become: true
+  apt:
+    pkg=make
+    state=latest
+    update_cache=yes
+    cache_valid_time=604800
+
 - name: Install unzip
-  become: yes
+  become: true
   apt:
     pkg=unzip
     state=latest
@@ -8,7 +16,7 @@
     cache_valid_time=604800
 
 - name: Install openjdk-7-jdk
-  become: yes
+  become: true
   apt:
     pkg=openjdk-7-jdk
     state=latest
@@ -32,7 +40,7 @@
     dest=/usr/local/bin
 
 - name: unzip vault_0.4.1_linux_amd64.zip
-  become: yes
+  become: true
   unarchive:
     src=/usr/local/bin/vault_0.4.1_linux_amd64.zip
     dest=/usr/local/bin

From a3bb09ac824917de9013831261371629973578ce Mon Sep 17 00:00:00 2001
From: "Christopher M. Neill" <cneill@gmail.com>
Date: Tue, 26 Apr 2016 14:07:03 -0700
Subject: [PATCH 3/3] Update base.yml

---
 ansible/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/base.yml b/ansible/base.yml
index a53209c6..190be5b4 100644
--- a/ansible/base.yml
+++ b/ansible/base.yml
@@ -9,7 +9,7 @@
       name={{ host }}
       groups=dock
 
-- hosts: "{{ host | default('docks') }}"
+- hosts: "{{ host }}"
   roles:
   - { role: package-dock, tags: [ dock, package ] }
   - { role: package-aws, tags: [ dock, package ] }