aboutsummaryrefslogtreecommitdiff
path: root/doc/multinode.rst
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-05 09:20:13 +0000
committerGerrit Code Review <review@openstack.org>2016-08-05 09:20:13 +0000
commit1160edb5e504f98dd0d1f04ef99ddc94bf705056 (patch)
tree8375107b8c84d97f3e61b88403f8bd10b27bc5b6 /doc/multinode.rst
parent1319e90cb907888b4a48c06af5d4fca1059fa397 (diff)
parentc3d8262ec54439a0e0d9b5aa4d0dbf58f284a436 (diff)
downloadkolla-1160edb5e504f98dd0d1f04ef99ddc94bf705056.tar.gz
kolla-1160edb5e504f98dd0d1f04ef99ddc94bf705056.zip
Merge "Add doc8 test and improve rst syntax"
Diffstat (limited to 'doc/multinode.rst')
-rw-r--r--doc/multinode.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/multinode.rst b/doc/multinode.rst
index 80f52e00a..b867cc1f0 100644
--- a/doc/multinode.rst
+++ b/doc/multinode.rst
@@ -24,8 +24,8 @@ with version greater than 2.3, do the following:
docker run -d -p 4000:5000 --restart=always --name registry registry:2
-Note: Kolla looks for the Docker registry to use port 4000. (Docker default is
-port 5000)
+.. note:: Kolla looks for the Docker registry to use port 4000. (Docker default is
+ port 5000)
After starting the registry, it is necessary to instruct Docker that it will
be communicating with an insecure registry. To enable insecure registry
@@ -52,7 +52,7 @@ 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:
::
@@ -60,7 +60,7 @@ Copy docker's systemd unit file to ``/etc/systemd/system/`` directory:
# 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]``
+variable and add ``$DOCKER_OPTS`` to the end of ExecStart in ``[Service]``
section:
::