openstack/kolla-ansible
Code Issues Proposed changes

Updates Docker bin in Heat template

Browse Source 
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
This commit is contained in:
Daneyon Hansen 2015-03-29 01:14:53 +00:00
parent 5ea37557cf
commit ed3f541a6f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devenv/kollanode.yaml
View File

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