openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add notes on docker version in quickstart and multinode guide"

Browse Source
This commit is contained in:
Jenkins 2017-10-06 04:36:36 +00:00 committed by Gerrit Code Review
commit a03b29829f
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::