openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix docker-1.7.0 binary download link"

Browse Source
This commit is contained in:
Jenkins 2015-06-24 23:13:17 +00:00 committed by Gerrit Code Review
commit 61900a3eba
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devenv/README.md
View File

@ -17,15 +17,8 @@ networking has a configuration similar to:
Sharing pid and networking namespaces is detailed in the Sharing pid and networking namespaces is detailed in the
[super privileged containers][] concept. [super privileged containers][] concept.
The Kolla cluster is based on Fedora 21, requires the Docker 1.5.0-dev The Kolla cluster is based on Fedora 21, requires the minimum Docker version of 1.7.0
[binary][] and runs a newer version of `docker-compose` that includes [binary][].
pid: host support. One of the authors of Kolla has a pull request
outstanding that the docker-compose maintainers have said they
would merge shortly.
The pull request is:
https://github.com/docker/compose/pull/1011
These templates are designed to work with the Icehouse or Juno These templates are designed to work with the Icehouse or Juno
versions of Heat. If using Icehouse Heat, this [patch][] is versions of Heat. If using Icehouse Heat, this [patch][] is

2
devenv/kollanode.yaml
View File

@ -162,7 +162,7 @@ resources:
yum -y install wget ntp git tcpdump python-pip python-devel yum -y install wget ntp git tcpdump python-pip python-devel
# Install Docker from binaries # Install Docker from binaries
curl -L https://master.dockerproject.com/linux/amd64/docker-1.7.0-dev -o /usr/local/sbin/docker curl -L https://get.docker.com/builds/Linux/x86_64/docker-1.7.0 -o /usr/local/sbin/docker
chmod +x /usr/local/sbin/docker && cd /usr/local/sbin/ chmod +x /usr/local/sbin/docker && cd /usr/local/sbin/
./docker -d & ./docker -d &