4 files changed, 22 insertions, 13 deletions

diff --git a/ansible/roles/docker/tasks/Debian.yml b/ansible/roles/docker/tasks/Debian.yml
index cf4128774..a03040d88 100644
--- a/ansible/roles/docker/tasks/Debian.yml
+++ b/ansible/roles/docker/tasks/Debian.yml
@@ -12,15 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-  - name: add Ubuntu docker repo
-    apt_repository: repo='deb [trusted=yes] {{ ubuntu_docker_url }} ubuntu-{{ ansible_distribution_release }} main' state=present
+  - name: Install docker.io
+    action: "{{ ansible_pkg_mgr }} name=docker.io state=present force=yes"
 
-  - name: ensure correct docker version
-    action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-    with_items: "{{ docker_packages[ansible_os_family] }}"
+  - name: Update package manager cache
+    tags:
+       - cache_update
+    package:
+       update_cache: yes
 
-  - name: remove Ubuntu docker repo
-    apt_repository:
-      repo: 'deb [trusted=yes] {{ ubuntu_docker_url }} ubuntu-{{ ansible_distribution_release }} main'
-      state: absent
-      update_cache: no
+  - name: Install python-pip
+    package:
+       name: python-pip
+       state: present
+
+  - name: Install docker-py
+    pip:
+       name: docker-py
+       state: present
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index bbec371a8..18e441462 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Intel Corporation.
+# Copyright (c) 2017-2019 Intel Corporation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,6 +18,10 @@
   - name: create docker service config dir
     file: path=/etc/systemd/system/docker.service.d state=directory
 
+  - name: docker configuration
+    template: src=daemon.json.j2 dest=/etc/docker/daemon.json owner=root mode=0644
+    when: 'docker_daemon_config is defined'
+
   - name: create docker proxy config
     template: src=http-proxy-conf.j2 dest=/etc/systemd/system/docker.service.d/http-proxy.conf owner=root mode=0644
     when: 'proxy_env is defined and "http_proxy" in proxy_env or "https_proxy" in proxy_env'
diff --git a/ansible/roles/docker/templates/daemon.json.j2 b/ansible/roles/docker/templates/daemon.json.j2
new file mode 100644
index 000000000..57bdc9f63
--- /dev/null
+++ b/ansible/roles/docker/templates/daemon.json.j2
@@ -0,0 +1 @@
+{{ docker_daemon_config | to_nice_json }}
diff --git a/ansible/roles/docker/vars/main.yml b/ansible/roles/docker/vars/main.yml
index 8b5077490..a735d523d 100644
--- a/ansible/roles/docker/vars/main.yml
+++ b/ansible/roles/docker/vars/main.yml
@@ -16,5 +16,3 @@ docker_project_url: https://yum.dockerproject.org
 docker_packages:
   "RedHat":
     - docker-engine-1.13.1
-  "Debian":
-    - docker-engine=1.13.1*