unify variable naming; cleanup tasks

defaults/main.yml

@@ -1,22 +1,19 @@
 ---
-consul_ip: 127.0.0.1
-docker_clusterstore: no
 dockerpy: no
-vagrant: no
 docker_proxy: no
 docker_http_proxy: ""
 docker_https_proxy: ""
 docker_no_proxy: ""
-upgrade_docker: false
+docker_upgrade: false
-default_docker_config:
+docker_default_config:
   storage-driver: devicemapper
   log-level: info
 
 docker_version: "17.06"
-setup_script_url: "https://releases.rancher.com/install-docker/{{ docker_version }}.sh"
+docker_setup_script_url: "https://releases.rancher.com/install-docker/{{ docker_version }}.sh"
 
 # DANGER! THIS VALUE IS USED TO VERIFY THAT THE DOCKER SETUP SCRIPT IS LEGITIMATE.
 # DO NOT MODIFY THIS UNLESS YOU HAVE SPECIFIED A DIFFERENT "docker_version" or "setup_script_url"
 # IF YOU HAVE GENERATED AN MD5 CHECKSUM FOR YOUR DESIRED SETUP SCRIPT, STORE IT IN THIS VARIABLE
 # IF YOU REALLY DON'T WANT TO VERIFY CHECKSUM, SET THIS VALUE TO "false" or "no"
-setup_script_md5_sum: "6be324016277879d49bd0e7f9f91e546"
+docker_setup_script_md5_sum: "6be324016277879d49bd0e7f9f91e546"

tasks/install.yml

@@ -1,15 +1,14 @@
 ---
-
 - name: Compose md5 checksum
   set_fact:
-    setup_script_checksum: "md5:{{ setup_script_md5_sum }}"
+    __docker_setup_script_checksum: "md5:{{ docker_setup_script_md5_sum }}"
-  when: setup_script_md5_sum is defined and setup_script_md5_sum
+  when: docker_setup_script_md5_sum != ""
 
 - name: Download docker setup script for desired version
   get_url:
-    url: "{{ setup_script_url }}"
+    url: "{{ docker_setup_script_url }}"
     dest: "/tmp/docker-setup.sh"
-    checksum: "{{ setup_script_checksum|default(omit) }}"
+    checksum: "{{ __docker_setup_script_checksum|default(omit) }}"
     mode: 0755
 
 - name: Execute docker setup script

tasks/main.yml

@@ -1,6 +1,17 @@
 ---
+- name: Gather variables for each operating system
+  include_vars: "{{ item }}"
+  with_items: "{{ ansible_os_family | lower }}.yml"
+  tags:
+    - always
 
-- include: "os/{{ ansible_os_family }}.yml"
+- include: preflight.yml
+
+- name: ensure docker dependencies are installed
+  package:
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ docker_dependencies }}"
 
 - name: check if docker is installed
   command: which dockerd
@@ -9,7 +20,7 @@
   ignore_errors: yes
 
 - include: "install.yml"
-  when: upgrade_docker or (which_dockerd | failed)
+  when: docker_upgrade or (which_dockerd | failed)
 
 - name: ensure config folder is present
   file:
@@ -22,15 +33,6 @@
     version: 1.9.0
   when: dockerpy
 
-- name: apply default daemon config
-  set_fact:
-    docker_json: "{{ default_docker_config | combine(docker_config | default({})) }}"
-
-- name: configure docker clusterstore
-  set_fact:
-    docker_json: '{{ docker_json | combine({"cluster-store": "consul://{{ consul_ip }}:8500"})}}'
-  when: docker_clusterstore
-
 - name: create directory for proxy file
   file:
     path: /etc/systemd/system/docker.service.d
@@ -65,8 +67,6 @@
   notify:
     - restart docker
 
-- meta: flush_handlers
-
 - name: ensure starts on system boot
   systemd:
     name: docker

tasks/os/Debian.yml

@@ -1,8 +0,0 @@
----
-- name: ensure docker dependencies are installed
-  apt:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - apt-transport-https
-    - ca-certificates

tasks/os/RedHat.yml

@@ -1,9 +0,0 @@
----
-
-- name: ensure docker dependencies are installed
-  yum:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - ca-certificates
-    - yum-utils

tasks/preflight.yml

@@ -0,0 +1,24 @@
+---
+- name: Set backwards compatibility for docker_upgrade var
+  set_fact:
+    docker_upgrade: "{{ upgrade_docker }}"
+  when: upgrade_docker is defined
+
+- name: Set backwards compatibility for default_config
+  set_fact:
+    docker_default_config: "{{ default_docker_config }}"
+  when: default_docker_config is defined
+
+- name: Set backwards compatibility for setup_script_md5_sum
+  set_fact:
+    docker_setup_script_md5_sum: "{{ setup_script_md5_sum }}"
+  when: setup_script_md5_sum is defined
+
+- name: Set backwards compatibility for setup_script_url
+  set_fact:
+    docker_setup_script_url: "{{ setup_script_url }}"
+  when: setup_script_url is defined
+
+- name: apply default daemon config
+  set_fact:
+    docker_json: "{{ docker_default_config | combine(docker_config | default({})) }}"

vars/debian.yml

@@ -0,0 +1,3 @@
+docker_dependencies:
+  - apt-transport-https
+  - ca-certificates

vars/redhat.yml

@@ -0,0 +1,3 @@
+docker_dependencies:
+  - ca-certificates
+  - yum-utils