From 6ec0977b17d634977f4b9723b241aa523c43acc9 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Fri, 25 Jan 2019 13:08:02 +0100
Subject: [PATCH] Fix: docker_package_version fubar

---
 defaults/main.yml       |  2 +-
 tasks/docker-redhat.yml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e1c78bd..9dae036 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,7 +3,7 @@
 docker_edition: 'ce'
 docker_package: "docker-{{ docker_edition }}"
 docker_package_state: present
-docker_package_version: nil
+docker_package_version: ''
 
 # Service options.
 docker_service_state: started
diff --git a/tasks/docker-redhat.yml b/tasks/docker-redhat.yml
index c682a81..23974ac 100644
--- a/tasks/docker-redhat.yml
+++ b/tasks/docker-redhat.yml
@@ -1,14 +1,14 @@
 ---
 - name: Set Docker package name
   set_fact:
-    docker_install_name: "{{ docker_package }}{{ '-' if docker_package_version }}{{ docker_package_version|default(omit) }}"
+    docker_install_name: "{{ docker_package }}{{ '-' if docker_package_version else ''}}{{ docker_package_version }}"
 
-- name: Check all the facts
-  debug:
-    msg: "Package: {{ docker_install_name }}, Is bigger then 18.01: {{ docker_package_version is version('18.01', '>=') }}"
+# - name: Check all the facts
+#  debug:
+#    msg: "Package: {{ docker_install_name }}, Is bigger then 18.01: {{ docker_package_version is version('18.01', '>=') }}"
 
 - name: Install Docker 17.03 on CentOS/Redhat
-  when: docker_package_version is version('17.03', '>=') and docker_package_version is version('18.01', '<')
+  when: docker_package_version and docker_package_version is version('17.03', '>=') and docker_package_version is version('18.01', '<')
   yum:
     name:
       - "docker-ce-selinux-{{ docker_package_version }}"
@@ -18,7 +18,7 @@
   notify: restart docker
 
 - name: Install Docker on CentOS/Redhat
-  when: docker_package_version is none or docker_package_version is version('18.01', '>=')
+  when: not docker_package_version or docker_package_version is version('18.01', '>=')
   package:
     name: "{{ docker_install_name }}"
     state: "{{ docker_package_state }}"