From ea5c945de71998ae66f4d6c2862f56711b86a8e5 Mon Sep 17 00:00:00 2001 From: tosih Date: Wed, 25 Jan 2017 10:52:19 -0800 Subject: [PATCH 1/2] Update dock-images role with new docker images to pre-pull. --- ansible/roles/dock-images/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ansible/roles/dock-images/tasks/main.yml b/ansible/roles/dock-images/tasks/main.yml index bf5f7bdf..b140e033 100644 --- a/ansible/roles/dock-images/tasks/main.yml +++ b/ansible/roles/dock-images/tasks/main.yml @@ -29,9 +29,14 @@ - "ruby:2.3" - "python:2.7" - "php:7.0-apache" + - "runnable/node-starter" + - "runnable/rails-starter" + - "runnable/django-starter" + - "runnable/laravel-starter" - "runnable/mysql:5.6" - "runnable/postgres:9.4" - "runnable/mongo:3.2" + - "runnable/redis:3.2" - name: stopping docker become: true From a13e7998306f8f22f1fc372d4cc56aeaf8aa398a Mon Sep 17 00:00:00 2001 From: tosih Date: Wed, 25 Jan 2017 15:10:08 -0800 Subject: [PATCH 2/2] Fix task. --- ansible/dock.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ansible/dock.yml b/ansible/dock.yml index f2b3f5da..9eea4fb6 100644 --- a/ansible/dock.yml +++ b/ansible/dock.yml @@ -7,14 +7,6 @@ - fail: msg="`dock` (target dock) needs to be defined to run this role" when: dock is not defined - - name: remove datadog agent - become: true - apt: - name=datadog-agent - state=absent - purge=yes - force=yes - - add_host: name={{ dock }} groups=dock @@ -24,6 +16,15 @@ - include: krain.yml git_branch="v0.3.0" - hosts: "{{ dock }}" + tasks: + - name: remove datadog agent + become: true + apt: + name=datadog-agent + state=absent + purge=yes + force=yes + roles: - { role: install-ssm } - { role: dock-images }