From ed3f541a6fdf8618055258c31704ae428a8093ed Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Sun, 29 Mar 2015 01:14:53 +0000
Subject: [PATCH] Updates Docker bin in Heat template

Previously, Heat was using the docker-1.5.0-dev version of the
Docker binary. This PS updates the Heat kollanode template to use
the latest version of the Docker binary used by the project due to

https://github.com/docker/docker/issues/11760#issuecomment-88288278

Change-Id: I1c771b89758baa9faaa04a0e647a23f32bff48a9
---
 devenv/kollanode.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml
index 22d1346b85..259406f5ca 100644
--- a/devenv/kollanode.yaml
+++ b/devenv/kollanode.yaml
@@ -161,14 +161,15 @@ resources:
             # Install base packages
             yum -y install wget ntp git tcpdump python-pip
 
-            # Install Docker binaries
-            # TODO Use pkg when API 1.18 is available
-            wget https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev -O docker
-            chmod +x docker
+            # Install Docker from binaries due to:
+            # https://github.com/docker/docker/issues/11760#issuecomment-88288278
+            curl https://fedorapeople.org/groups/heat/docker-1.6.0-rc3 -o /docker
+            chmod +x /docker && cd /
             ./docker -d &
 
             # Install Compose with pid=host support
             # TODO: Use pkg when github.com/docker/compose/pull/1011 is merged
+            cd /root
             git clone http://github.com/sdake/fig
             cd fig
             pip install -e .