From b570566334a3821a030bf56c0ecfc677d25ead24 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 11 Oct 2018 15:38:52 -0700
Subject: [PATCH] Install docker from distro properly

The install-docker role was installing the wrong package name for distro
package based installations. docker-engine is ancient on debuntu and
appears to be called docker.io on both debian and ubuntu supported
releases now. Go ahead and install docker.io on the Debian family of
distros and docker on everything else (fedora, centos, suse, etc).

Change-Id: I0d7a9b8257bd6db86bc6e3d8bb3d6c3c021d7954
---
 .../tasks/{distro.yaml => distros/Debian.yaml}      |  2 +-
 roles/install-docker/tasks/distros/default.yaml     |  5 +++++
 roles/install-docker/tasks/main.yaml                | 13 +++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)
 rename roles/install-docker/tasks/{distro.yaml => distros/Debian.yaml} (73%)
 create mode 100644 roles/install-docker/tasks/distros/default.yaml

diff --git a/roles/install-docker/tasks/distro.yaml b/roles/install-docker/tasks/distros/Debian.yaml
similarity index 73%
rename from roles/install-docker/tasks/distro.yaml
rename to roles/install-docker/tasks/distros/Debian.yaml
index 52cd83632..99fd589ac 100644
--- a/roles/install-docker/tasks/distro.yaml
+++ b/roles/install-docker/tasks/distros/Debian.yaml
@@ -1,5 +1,5 @@
 - name: Install docker
   become: yes
   package:
-    name: docker-engine
+    name: docker.io
     state: present
diff --git a/roles/install-docker/tasks/distros/default.yaml b/roles/install-docker/tasks/distros/default.yaml
new file mode 100644
index 000000000..d2c1da59d
--- /dev/null
+++ b/roles/install-docker/tasks/distros/default.yaml
@@ -0,0 +1,5 @@
+- name: Install docker
+  become: yes
+  package:
+    name: docker
+    state: present
diff --git a/roles/install-docker/tasks/main.yaml b/roles/install-docker/tasks/main.yaml
index c6e5cb38f..875d7603b 100644
--- a/roles/install-docker/tasks/main.yaml
+++ b/roles/install-docker/tasks/main.yaml
@@ -14,8 +14,17 @@
   include: upstream.yaml
   when: use_upstream_docker
 
-- name: Install docker-engine from distro
-  include: distro.yaml
+- name: Install docker from distro
+  include_tasks: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}.{{ ansible_architecture }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - distros
   when: not use_upstream_docker
 
 - name: Add user to docker group