openstack/kolla-ansible
Code Issues Proposed changes

Add notes on docker version in quickstart and multinode guide

Browse Source 
In the quickstart guide, the min version of docker is 1.10.0,
and the max version is none. But the `docker daemon` doesn't work
since v1.13.0. Please refer to:
https://docs.docker.com/engine/deprecated/#docker-daemon-subcommand
"docker daemon subcommand
Deprecated In Release: v1.13.0
Target For Removal In Release: v17.12
The daemon is moved to a separate binary (dockerd), and should
be used instead."
I think it's better to let the readers know it.

Change-Id: I92882a3860704acdc31ff0c89e21ab2793e0b268
This commit is contained in:
chao liu 2017-10-01 16:16:24 -07:00
parent 9cf89634c6
commit a5f242e4a2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/user/multinode.rst
View File

@ -112,6 +112,12 @@ section:
ExecStart= ExecStart=
ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS ExecStart=/usr/bin/docker daemon -H fd:// $DOCKER_OPTS
.. note::
If your docker version is >=1.13.0, the ``docker daemon`` should be replaced
with ``dockerd``.
Restart Docker by executing the following commands: Restart Docker by executing the following commands:
:: ::

8
doc/source/user/quickstart.rst
View File

@ -441,9 +441,11 @@ to include the MTU size to be used for Docker containers.
.. note:: .. note::
Depend of your Docker version and distro, ExecStart command may be different which may cause Depend of your Docker version and distro, ExecStart command may be
Docker start failures. The default ExecStart command for your system can be obtained from different which may cause Docker start failures. If your docker version
``/usr/lib/systemd/system/docker.service``. is >= 1.13.0, the ``docker daemon`` is moved to ``dockerd``, and should
be used instead. The default ExecStart command for your system can be
obtained from ``/usr/lib/systemd/system/docker.service``.
.. note:: .. note::