From a4e32c748aef1e224209979e290e64a017a1fc66 Mon Sep 17 00:00:00 2001
From: ntfrnzn <nathan.franzen@ctl.io>
Date: Fri, 12 Feb 2016 14:45:09 -0800
Subject: [PATCH] pin docker version actually

---
 roles/docker/vars/centos-6.yml  | 2 ++
 roles/docker/vars/debian.yml    | 9 +++++++--
 roles/docker/vars/fedora-20.yml | 2 ++
 roles/docker/vars/fedora.yml    | 6 +++++-
 roles/docker/vars/ubuntu.yml    | 8 ++++++--
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/roles/docker/vars/centos-6.yml b/roles/docker/vars/centos-6.yml
index b657b386d..10f2aa9be 100644
--- a/roles/docker/vars/centos-6.yml
+++ b/roles/docker/vars/centos-6.yml
@@ -1,5 +1,7 @@
 docker_kernel_min_version: '2.6.32-431'
 
+# versioning: docker-io itself is pinned at docker 1.5
+
 docker_package_info:
   pkg_mgr: yum
   pkgs:
diff --git a/roles/docker/vars/debian.yml b/roles/docker/vars/debian.yml
index b4d8209f0..aed7121f2 100644
--- a/roles/docker/vars/debian.yml
+++ b/roles/docker/vars/debian.yml
@@ -1,10 +1,15 @@
 docker_kernel_min_version: '3.2'
-docker_version: 1.9.1-0~{{ ansible_distribution_release|lower }}
+
+# https://apt.dockerproject.org/repo/dists/debian-wheezy/main/filelist
+docker_versioned_pkg:
+  latest: docker-engine
+  1.9: docker-engine=1.9.1-0~{{ ansible_distribution_release|lower }}
+  1.10: docker-engine=1.10.0-0~{{ ansible_distribution_release|lower }}
 
 docker_package_info:
   pkg_mgr: apt
   pkgs:
-    - docker-engine={{ docker_version }}
+    - "{{ docker_versioned_pkg[docker_version] }}"
 
 docker_repo_key_info:
   pkg_key: apt_key
diff --git a/roles/docker/vars/fedora-20.yml b/roles/docker/vars/fedora-20.yml
index 87fdcccd8..520469279 100644
--- a/roles/docker/vars/fedora-20.yml
+++ b/roles/docker/vars/fedora-20.yml
@@ -1,5 +1,7 @@
 docker_kernel_min_version: '0'
 
+# versioning: docker-io itself is pinned at docker 1.5
+
 docker_package_info:
   pkg_mgr: yum
   pkgs:
diff --git a/roles/docker/vars/fedora.yml b/roles/docker/vars/fedora.yml
index 7f92dfb06..aae1c024d 100644
--- a/roles/docker/vars/fedora.yml
+++ b/roles/docker/vars/fedora.yml
@@ -1,9 +1,13 @@
 docker_kernel_min_version: '0'
 
+docker_versioned_pkg:
+  latest: docker
+  1.9: docker-1:1.9.1
+
 docker_package_info:
   pkg_mgr: dnf
   pkgs:
-    - docker
+    - "{{ docker_versioned_pkg[docker_version] }}"
 
 docker_repo_key_info:
   pkg_key: ''
diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml
index 311d73a54..853b2798b 100644
--- a/roles/docker/vars/ubuntu.yml
+++ b/roles/docker/vars/ubuntu.yml
@@ -1,10 +1,14 @@
 docker_kernel_min_version: '3.2'
-docker_version: 1.9.0-0~{{ ansible_distribution_release }}
+
+# https://apt.dockerproject.org/repo/dists/ubuntu-trusty/main/filelist
+docker_versioned_pkg:
+  latest: docker-engine
+  1.9: docker-engine=1.9.0-0~{{ ansible_distribution_release|lower }}
 
 docker_package_info:
   pkg_mgr: apt
   pkgs:
-    - docker-engine={{ docker_version }}
+    - "{{ docker_versioned_pkg[docker_version] }}"
 
 docker_repo_key_info:
   pkg_key: apt_key