diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-03-29 01:14:53 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-09 18:27:16 +0000 |
| commit | ed3f541a6fdf8618055258c31704ae428a8093ed (patch) | |
| tree | 4db14a998dc3aa9721c30e75a3fae845a10ecf17 /devenv | |
| parent | 5ea37557cf1d5600e0bb141e010a4bcdbd967162 (diff) | |
| download | kolla-ed3f541a6fdf8618055258c31704ae428a8093ed.tar.gz kolla-ed3f541a6fdf8618055258c31704ae428a8093ed.zip | |
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
Diffstat (limited to 'devenv')
| -rw-r--r-- | devenv/kollanode.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index 22d1346b8..259406f5c 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 . |