From 1893abc306703cd59167eaa9ff893e051fbc4ffe Mon Sep 17 00:00:00 2001
From: Jason Myers <jason@jasonamyers.com>
Date: Wed, 24 Feb 2016 13:57:16 -0600
Subject: [PATCH] Remove information about downgrading docker
Since docker 1.10.1 is required, and docker 1.8.2 does not work with Kolla,
Remove the downgrade instructions
TrivialFix
Change-Id: I461572a40b6fc96f73593cf989967449e4bc8e0a
Signed-off-by: Jason Myers <jason@jasonamyers.com>
---
doc/quickstart.rst | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 499112d1a9..2e17317589 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -104,26 +104,15 @@ command:
curl -sSL https://get.docker.io | bash
This command will install the most recent stable version of Docker, but please
-note what Kolla releases are not in sync with docker in any way, so some things
-could stop working with new version. Kolla release 1.0.0-liberty tested to
-work with docker 1.8.2, to check you docker version run this command:
+note that Kolla releases are not in sync with docker in any way, so some things
+could stop working with new version. The latest release of Kolla is tested to
+work with docker-engine >= 1.10.0. To check your docker version run this
+command:
::
docker --version
-Docker 1.8.3 and later are incompatible with Kolla Liberty. Versions greater
-than 1.8.2 are functional with master branch (Mitaka). If the version installed
-is 1.8.3 or later and you are running Liberty, downgrade using these commands:
-
-::
-
- # Centos 7
- yum downgrade docker-engine-1.8.2
- systemctl restart docker.service
-
- # Ubuntu 14.04 LTS
- apt-get install docker-engine=1.8.2-0~trusty
When running with systemd, setup docker-engine with the appropriate
information in the Docker daemon to launch with. This means setting up the