Proposed update for upstream

----------------------------

  1. Added some vars to defaults so that the end user can decide whether to use vagrant and docker-py
  1. Updated syntax on tasks to follow `key: value` instead of `key=value` format, to make it easier
     to track changes
  1. Using an explicit become in the handler, since the task may not be run by root

defaults/main.yml

@@ -2,3 +2,6 @@
 consul_ip: 127.0.0.1
 docker_clusterstore: no
 dockerpy: no
+vagrant: yes
+docker_gpg_key: 58118E89F3A912897C070ADBF76221572C52609D
+key_server: hkp://p80.pool.sks-keyservers.net:80

handlers/main.yml

@@ -1,5 +1,6 @@
 ---
 - name: reload unit
+  become: true
   command: systemctl daemon-reload
 
 - name: restart docker

tasks/main.yml

@@ -2,10 +2,14 @@
 - include: "os/{{ ansible_os_family }}.yml"
 
 - name: ensure config folder is present
-  file: path=/etc/docker state=directory
+  file:
+    path: /etc/docker
+    state: directory
 
 - name: ensure docker-py module is installed
-  pip: name=docker-py version=1.9.0
+  pip:
+    name: docker-py
+    version: 1.9.0
   when: dockerpy
 
 - name: ensure daemon config file is present
@@ -15,18 +19,24 @@
   notify:
     - restart docker
 
-# - name: ensure unit file is present & up to date
-#   copy:
-#     src: docker.service
-#     dest: /usr/lib/systemd/system/docker.service
-#   notify:
-#     - reload unit
-#     - restart docker
+- name: ensure unit file is present & up to date
+  copy:
+    src: docker.service
+    dest: /usr/lib/systemd/system/docker.service
+  notify:
+    - reload unit
+    - restart docker
 
 - meta: flush_handlers
 
 - name: ensure starts on system boot
-  service: name=docker enabled=yes
+  service:
+    name: docker
+    enabled: yes
 
 - name: ensure vagrant user can run docker commands
-  user: name=vagrant groups=docker append=yes
+  user:
+    name: vagrant
+    groups: docker
+    append: yes
+  when: vagrant

tasks/os/Debian.yml

@@ -1,19 +1,28 @@
 ---
 - name: ensure docker dependencies are installed
-  apt: name={{ item }} state=present
+  apt:
+    name: "{{ item }}"
+    state: present
   with_items:
     - apt-transport-https
     - ca-certificates
 
 - name: ensure Docker GPG key is present
-  apt_key: id=58118E89F3A912897C070ADBF76221572C52609D keyserver=hkp://p80.pool.sks-keyservers.net:80
+  apt_key:
+    id: "{{ docker_gpg_key }}"
+    keyserver: "{{ key_server }}"
 
 - name: ensure repo is present
-  copy: src=files/docker.apt.repo dest=/etc/apt/sources.list.d/docker.list
+  copy:
+    src: docker.apt.repo
+    dest: /etc/apt/sources.list.d/docker.list
   register: repofile
 
 - name: ensure apt cache is updated
-  apt: update_cache=yes
+  apt:
+    update_cache: yes
 
 - name: ensure docker is installed
-  apt: name=docker-engine state=present
+  apt:
+    name: docker-engine
+    state: present

tasks/os/RedHat.yml

@@ -1,6 +1,10 @@
 ---
 - name: ensure repo is present
-  copy: src=files/docker.yum.repo dest=/etc/yum.repos.d/docker.repo
+  copy:
+    src: docker.yum.repo
+    dest: /etc/yum.repos.d/docker.repo
 
 - name: ensure docker is installed
-  yum: name=docker-engine state=present
+  yum:
+    name: docker-engine
+    state: present