From 7a9b3d13a5a251e893ce052d2d9fa9b5ff2f71b3 Mon Sep 17 00:00:00 2001
From: kaushikanurag <kaushikanu@hotmail>
Date: Tue, 8 Mar 2016 11:25:26 -0800
Subject: [PATCH 1/6] remove the pinning file

---
 ansible/roles/docker/files/docker-engine | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 ansible/roles/docker/files/docker-engine

diff --git a/ansible/roles/docker/files/docker-engine b/ansible/roles/docker/files/docker-engine
deleted file mode 100644
index c2f63a90..00000000
--- a/ansible/roles/docker/files/docker-engine
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: docker-engine
-Pin: version 1.9.1*
-Pin-Priority: 1001

From af97edcc383e4296b8aabf9fb8b1cf1fdf617bd0 Mon Sep 17 00:00:00 2001
From: kaushikanurag <kaushikanu@hotmail>
Date: Tue, 8 Mar 2016 11:43:47 -0800
Subject: [PATCH 2/6] remove ref to docker 1.9

---
 ansible/roles/docker/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml
index 5735c856..aa628277 100644
--- a/ansible/roles/docker/defaults/main.yml
+++ b/ansible/roles/docker/defaults/main.yml
@@ -1,2 +1,2 @@
 ---
-docker_package_name: docker-engine=1.9.1-0~trusty
+docker_package_name: docker-engine

From dd9a3c36fcc14b2dde784f36a867683af4bf4ca1 Mon Sep 17 00:00:00 2001
From: kaushikanurag <kaushikanu@hotmail>
Date: Tue, 8 Mar 2016 11:52:23 -0800
Subject: [PATCH 3/6] removed defaults folder and hardcode docker package in
 task

---
 ansible/roles/docker/tasks/main.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 26af2910..d6e44787 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -65,33 +65,21 @@
   register: copied_config
   tags: genDockerConfig
 
-- name: force docker version
-  become: true
-  copy:
-    src=docker-engine
-    dest=/etc/apt/preferences.d/docker-engine
-    owner=root
-    group=root
-    mode=0600
-
 - name: apt-get update
   become: true
   apt:
      update_cache=yes
 
-
 - name: install docker
   become: true
   when: restart is defined or dock is defined
   apt:
-    pkg="{{ docker_package_name }}"
+    pkg=docker-engine
     state=present
     force=yes
-    dpkg_options='force-confold,force-confdef'
     update_cache=yes
     cache_valid_time=604800
 
-
 - name: restart docker
   when: (copied_config.changed and restart is defined) or dock is defined
   command: sudo service docker restart

From ec18ef9aa5c9c0e7caffdb0ed2499dd3cb314e65 Mon Sep 17 00:00:00 2001
From: kaushikanurag <kaushikanu@hotmail>
Date: Tue, 8 Mar 2016 13:03:34 -0800
Subject: [PATCH 4/6] add back variable to control the version of docker

---
 ansible/roles/docker/defaults/main.yml | 3 +--
 ansible/roles/docker/tasks/main.yml    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml
index aa628277..5e972456 100644
--- a/ansible/roles/docker/defaults/main.yml
+++ b/ansible/roles/docker/defaults/main.yml
@@ -1,2 +1 @@
----
-docker_package_name: docker-engine
+docker_package_name: docker-engine=1.10.2
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index d6e44787..6fce9e86 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -74,7 +74,7 @@
   become: true
   when: restart is defined or dock is defined
   apt:
-    pkg=docker-engine
+    pkg={{ docker_package_name }}
     state=present
     force=yes
     update_cache=yes

From fa1f028fd8d0a487ca850ea6096fbf534f1feb65 Mon Sep 17 00:00:00 2001
From: kaushikanurag <kaushikanu@hotmail>
Date: Tue, 8 Mar 2016 14:15:27 -0800
Subject: [PATCH 5/6] install specific version

---
 ansible/roles/docker/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml
index 5e972456..a0e0df2b 100644
--- a/ansible/roles/docker/defaults/main.yml
+++ b/ansible/roles/docker/defaults/main.yml
@@ -1 +1 @@
-docker_package_name: docker-engine=1.10.2
+docker_package_name: docker-engine=1.10.2-0~trusty

From dad98433ce9511fc3591a0a15442dd0aeea6df9e Mon Sep 17 00:00:00 2001
From: kaushikanurag <kaushikanu@hotmail>
Date: Tue, 8 Mar 2016 14:16:52 -0800
Subject: [PATCH 6/6] add --- for yml

---
 ansible/roles/docker/defaults/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml
index a0e0df2b..c78329ff 100644
--- a/ansible/roles/docker/defaults/main.yml
+++ b/ansible/roles/docker/defaults/main.yml
@@ -1 +1,2 @@
+---
 docker_package_name: docker-engine=1.10.2-0~trusty