openstack/kolla-ansible
Code Issues Proposed changes

Merge "Updates Docker bin in Heat template"

Browse Source
This commit is contained in:
Jenkins 2015-04-09 21:11:28 +00:00 committed by Gerrit Code Review
commit 82578471ae
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
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 .