diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-24 23:13:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-24 23:13:17 +0000 |
| commit | 61900a3ebaad0576047016e0fa5e99d13c11a775 (patch) | |
| tree | f06e5de93cb545f5005a344832153ad84f65d9b5 | |
| parent | 0525afce5c540989e955997af94356c8e7bda988 (diff) | |
| parent | 4f6a49769e3994d78844d702a70d10fd8fb9c15a (diff) | |
| download | kolla-61900a3ebaad0576047016e0fa5e99d13c11a775.tar.gz kolla-61900a3ebaad0576047016e0fa5e99d13c11a775.zip | |
Merge "Fix docker-1.7.0 binary download link"
| -rw-r--r-- | devenv/README.md | 11 | ||||
| -rw-r--r-- | devenv/kollanode.yaml | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/devenv/README.md b/devenv/README.md index ab9f10cbc..000bbd071 100644 --- a/devenv/README.md +++ b/devenv/README.md @@ -17,15 +17,8 @@ networking has a configuration similar to: Sharing pid and networking namespaces is detailed in the [super privileged containers][] concept. -The Kolla cluster is based on Fedora 21, requires the Docker 1.5.0-dev -[binary][] and runs a newer version of `docker-compose` that includes -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 +The Kolla cluster is based on Fedora 21, requires the minimum Docker version of 1.7.0 +[binary][]. These templates are designed to work with the Icehouse or Juno versions of Heat. If using Icehouse Heat, this [patch][] is diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index 4ec9d19ed..b3d39a236 100644 --- a/devenv/kollanode.yaml +++ b/devenv/kollanode.yaml @@ -162,7 +162,7 @@ resources: yum -y install wget ntp git tcpdump python-pip python-devel # 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/ ./docker -d & |