openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix some minor errors in the doc"

Browse Source
This commit is contained in:
Jenkins 2016-08-23 10:12:13 +00:00 committed by Gerrit Code Review
commit a9f875cddb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/multinode.rst
View File

@ -52,12 +52,12 @@ Edit ``/etc/default/docker`` and add:
# Ubuntu # Ubuntu
DOCKER_OPTS="--insecure-registry 192.168.1.100:4000" DOCKER_OPTS="--insecure-registry 192.168.1.100:4000"
If ubuntu is using systemd, additional settings needs to be configured. If Ubuntu is using systemd, additional settings needs to be configured.
Copy docker's systemd unit file to ``/etc/systemd/system/`` directory: Copy docker's systemd unit file to ``/etc/systemd/system/`` directory:
:: ::
# cp /lib/systemd/system/docker.service /etc/systemd/system/docker.service cp /lib/systemd/system/docker.service /etc/systemd/system/docker.service
Next, modify ``/etc/systemd/system/docker.service``, add ``environmentFile`` Next, modify ``/etc/systemd/system/docker.service``, add ``environmentFile``
variable and add ``$DOCKER_OPTS`` to the end of ExecStart in ``[Service]`` variable and add ``$DOCKER_OPTS`` to the end of ExecStart in ``[Service]``

4
doc/quickstart.rst
View File

@ -135,6 +135,10 @@ the drop-in unit file as follows, reload and restart the docker service:
MountFlags=shared MountFlags=shared
EOF EOF
Restart docker by executing the following commands:
::
# Run these commands to reload the daemon # Run these commands to reload the daemon
systemctl daemon-reload systemctl daemon-reload
systemctl restart docker systemctl restart docker