aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-21 11:25:57 +0000
committerGerrit Code Review <review@openstack.org>2016-09-21 11:25:57 +0000
commit06c2eb43bf95e5db1c53cd818a55b81305f2aedc (patch)
tree2edd570a6d7acd77f9aad5f47eeac60762c80640
parentd10015dbeac57c088e13d8931afeb8e0bbd86645 (diff)
parentef401e356ef97bc31d4d487f1964b2f7cc425189 (diff)
downloadkolla-06c2eb43bf95e5db1c53cd818a55b81305f2aedc.tar.gz
kolla-06c2eb43bf95e5db1c53cd818a55b81305f2aedc.zip
Merge "Delete the unnecessary space"
-rw-r--r--doc/architecture-guide.rst4
-rw-r--r--doc/cinder-guide.rst4
-rw-r--r--doc/external-ceph-guide.rst2
-rw-r--r--doc/kuryr-guide.rst2
-rw-r--r--doc/quickstart.rst6
5 files changed, 9 insertions, 9 deletions
diff --git a/doc/architecture-guide.rst b/doc/architecture-guide.rst
index 35693a35a..63d5e895e 100644
--- a/doc/architecture-guide.rst
+++ b/doc/architecture-guide.rst
@@ -4,7 +4,7 @@
Production architecture guide
=============================
-This guide will help with configuring Kolla to suit production needs. It is
+This guide will help with configuring Kolla to suit production needs. It is
meant to answer some questions regarding basic configuration options that Kolla
requires. This document also contains other useful pointers.
@@ -39,7 +39,7 @@ In Kolla operators should configure following network interfaces:
* api_interface - This interface is used for the management network. The
management network is the network OpenStack services uses to communicate to
- each other and the databases. There are know security risks here, so it's
+ each other and the databases. There are know security risks here, so it's
recommended to make this network internal, not accessible from outside.
Defaults to network_interface.
diff --git a/doc/cinder-guide.rst b/doc/cinder-guide.rst
index aee91b331..68cf65e3d 100644
--- a/doc/cinder-guide.rst
+++ b/doc/cinder-guide.rst
@@ -22,10 +22,10 @@ a real physical volume or a loopback mounted file for development.
The Cinder community has closed a bug as WontFix which makes it
impossible for LVM to be used at all in a multi-controller setup.
The only option for multi-controller storage to work correctly at
- present is via a Ceph deployment. If community members disagree
+ present is via a Ceph deployment. If community members disagree
with this decision, please report the specific use case in the
Cinder bug tracker here:
- `_bug 1571211 <https://launchpad.net/bugs/1571211>`__.
+ `_bug 1571211 <https://launchpad.net/bugs/1571211>`__.
Create a Volume Group
diff --git a/doc/external-ceph-guide.rst b/doc/external-ceph-guide.rst
index 105a089cc..12f7ad7d2 100644
--- a/doc/external-ceph-guide.rst
+++ b/doc/external-ceph-guide.rst
@@ -164,7 +164,7 @@ Put ceph.conf and keyring file into ``/etc/kolla/config/nova``:
::
$ ls /etc/kolla/config/nova
- ceph.client.nova.keyring ceph.conf
+ ceph.client.nova.keyring ceph.conf
Configure nova-compute to use Ceph as the ephemeral backend by creating
``/etc/kolla/config/nova/nova-compute.conf`` and adding the following
diff --git a/doc/kuryr-guide.rst b/doc/kuryr-guide.rst
index 6303a53d6..7e0d48851 100644
--- a/doc/kuryr-guide.rst
+++ b/doc/kuryr-guide.rst
@@ -19,7 +19,7 @@ file.
::
- ExecStart= -H tcp://172.16.1.13:2375 -H unix:///var/run/docker.sock --cluster-store=etcd://172.16.1.13:2379 --cluster-advertise=172.16.1.13:2375
+ ExecStart= -H tcp://172.16.1.13:2375 -H unix:///var/run/docker.sock --cluster-store=etcd://172.16.1.13:2379 --cluster-advertise=172.16.1.13:2375
The IP address is host runnning the etcd service. ```2375``` is port that allows
Docker daemon to be accessed remotely. ```2379``` is the etcd listening port.
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index a14eeea1b..56700134a 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -51,7 +51,7 @@ and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run:
.. WARNING::
Operators performing an evaluation or deployment should use a stable
- branch. Operators performing development (or developers) should use
+ branch. Operators performing development (or developers) should use
master.
.. note:: Install is *very* sensitive about version of components. Please
@@ -253,7 +253,7 @@ On CentOS or RHEL systems, this can be done using:
yum install ansible
Many DEB based systems do not meet Kolla's Ansible version requirements. It is
-recommended to use pip to install Ansible >2.0. Finally Ansible >2.0 may be
+recommended to use pip to install Ansible >2.0. Finally Ansible >2.0 may be
installed using:
::
@@ -270,7 +270,7 @@ requirements it can be installed by:
.. WARNING::
Kolla uses PBR in its implementation. PBR provides version information
to Kolla about the package in use. This information is later used when
- building images to specify the Docker tag used in the image built. When
+ building images to specify the Docker tag used in the image built. When
installing the Kolla package via pip, PBR will always use the PBR version
information. When obtaining a copy of the software via git, PBR will use
the git version information, but **ONLY** if Kolla has not been pip