From: Jeremy Phelps <jphelps@linuxfoundation.org>
Date: Thu, 16 Aug 2018 19:53:17 +0000 (-0500)
Subject: Allow version to be set by end user
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=ac88349a6f42180b4264969c288b1aee8fad9ad3;p=ansible%2Froles%2Fdocker-install.git

Allow version to be set by end user

In the case that the version is not set, then the role will simply
install the latest available from the docker repos.

Change-Id: I31d84ac1eb8e40c829247dc194d24197dc019508
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
---

diff --git a/defaults/main.yml b/defaults/main.yml
index 0d34070..82f5e38 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,6 @@
 ---
 docker_service_enable: true
 mtu: 1500
+docker_ce_name: docker-ce
+ubuntu_docker_version: latest
+centos_docker_version: latest
diff --git a/tasks/main.yml b/tasks/main.yml
index 2aec7f7..94a536b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,6 +9,20 @@
     host_arch: "armhf"
   when: "'aarch64' in ansible_architecture"
 
+- name: "Checking for Centos docker version"
+  set_fact:
+    docker_ce_name: 'docker-ce-{{centos_docker_version}}'
+  when:
+    - ansible_os_family == 'RedHat'
+    - centos_docker_version != 'latest'
+
+- name: "Checking for Ubuntu docker version"
+  set_fact:
+    docker_ce_name: 'docker-ce={{ubuntu_docker_version}}'
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ubuntu_docker_version != 'latest'
+
 - name: Install Docker (RedHat)
   block:
     - name: Install Docker requirements
@@ -23,7 +37,10 @@
         dest: /etc/yum.repos.d/docker-ce.repo
         mode: 0644
     - name: Install Docker CE
-      yum: name=docker-ce state=present update_cache=yes
+      yum:
+        name: '{{docker_ce_name}}'
+        state: present
+        update_cache: true
   when: ansible_os_family == 'RedHat'
   become: true
 
@@ -46,7 +63,10 @@
         repo: 'deb [arch={{host_arch}}] https://download.docker.com/linux/ubuntu {{ansible_distribution_release}} stable'
         state: present
     - name: Install Docker CE
-      apt: name=docker-ce state=present update_cache=yes
+      apt:
+        name: '{{docker_ce_name}}'
+        state: present
+        update_cache: true
   when: ansible_distribution == 'Ubuntu'
   become: true