From 98ae2332691836d7d327615e270772cb620b7a17 Mon Sep 17 00:00:00 2001
From: Phillip Thurston <phil@goinvictus.com>
Date: Thu, 3 Aug 2017 20:56:02 -0600
Subject: [PATCH 1/4] Eliminated the need for two OS specific tasks when it can
 be done with one.

---
 tasks/main.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index ba197cf..eac32d8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,6 @@
 ---
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- include: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
+- name: OS specific setup
+  include: include: "setup-{{ ansible_os_family }}.yml"
 
 - name: Install Docker.
   package: name={{ docker_package }} state={{ docker_package_state }}

From ab9c581a4bc1185218d07f1866da9eb054d3cb60 Mon Sep 17 00:00:00 2001
From: Phillip Thurston <phil@goinvictus.com>
Date: Thu, 3 Aug 2017 21:12:14 -0600
Subject: [PATCH 2/4] Added variable to selectivley skip entire role if needed.

---
 defaults/main.yml | 1 +
 tasks/main.yml    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/defaults/main.yml b/defaults/main.yml
index 65fb26a..b6ee17b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,6 @@
 ---
 # Edition can be one of: 'ce' (Community Edition) or 'ee' (Enterprise Edition).
+docker_install: true
 docker_edition: 'ce'
 docker_package: "docker-{{ docker_edition }}"
 docker_package_state: present
diff --git a/tasks/main.yml b/tasks/main.yml
index eac32d8..861c0d6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,15 +1,18 @@
 ---
 - name: OS specific setup
   include: include: "setup-{{ ansible_os_family }}.yml"
+  when: docker_install
 
 - name: Install Docker.
   package: name={{ docker_package }} state={{ docker_package_state }}
+  when: docker_install
 
 - name: Ensure Docker is started and enabled at boot.
   service:
     name: docker
     state: started
     enabled: yes
+  when: docker_install
 
 - include: docker-compose.yml
   when: docker_install_compose

From 7605802735636a97129d9a164c11219e3ea98b22 Mon Sep 17 00:00:00 2001
From: Phillip Thurston <phil@goinvictus.com>
Date: Thu, 3 Aug 2017 21:15:41 -0600
Subject: [PATCH 3/4] removed extra include that I had forgotten to remove.

---
 tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 861c0d6..c970290 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: OS specific setup
-  include: include: "setup-{{ ansible_os_family }}.yml"
+  include: "setup-{{ ansible_os_family }}.yml"
   when: docker_install
 
 - name: Install Docker.

From c0b4968b0ee5ac4366216454fc965cab03126d28 Mon Sep 17 00:00:00 2001
From: Phillip Thurston <phil@goinvictus.com>
Date: Thu, 17 Aug 2017 14:33:14 -0600
Subject: [PATCH 4/4] Added recommended extra packages for Trusty. closes
 geerlingguy/ansible-role-docker#22

---
 tasks/setup-Debian.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index d0be48d..621ff5d 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -15,6 +15,20 @@
     - apt-transport-https
     - ca-certificates
 
+- name: Get Kernel release
+  command: uname -r
+  register: docker_kernel_release
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"
+  
+- name: Ensure Trusty packages are installed
+  apt:
+    name: "{{ item }}"
+    state: present
+  with_items:
+    - "linux-image-extra-{{ docker_kernel_release }}"
+    - linux-image-extra-virtual
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"
+
 - name: Add Docker apt key.
   apt_key:
     url: https://download.docker.com/linux/ubuntu/gpg