aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-23 10:12:13 +0000
committerGerrit Code Review <review@openstack.org>2016-08-23 10:12:13 +0000
commita9f875cddb8556edeb03d6de05c51d5b0623f1b6 (patch)
treed1d8f27e3abbfcbd0be8f26d668173ebf4ac4ce0 /doc
parent4d1b3e24719cd2ca60bd8b2ffa1502f830f31c5d (diff)
parentc3410a9cfe626922d9cb452ba990e3ad56481653 (diff)
downloadkolla-a9f875cddb8556edeb03d6de05c51d5b0623f1b6.tar.gz
kolla-a9f875cddb8556edeb03d6de05c51d5b0623f1b6.zip
Merge "Fix some minor errors in the doc"
Diffstat (limited to 'doc')
-rw-r--r--doc/multinode.rst4
-rw-r--r--doc/quickstart.rst4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/multinode.rst b/doc/multinode.rst
index b867cc1f0..37bfe53e1 100644
--- a/doc/multinode.rst
+++ b/doc/multinode.rst
@@ -52,12 +52,12 @@ Edit ``/etc/default/docker`` and add:
# Ubuntu
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:
::
- # 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``
variable and add ``$DOCKER_OPTS`` to the end of ExecStart in ``[Service]``
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index ac906a5ff..42eedd3ea 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -135,6 +135,10 @@ the drop-in unit file as follows, reload and restart the docker service:
MountFlags=shared
EOF
+Restart docker by executing the following commands:
+
+::
+
# Run these commands to reload the daemon
systemctl daemon-reload
systemctl restart docker