openstack/openstack-manuals
Code Issues Proposed changes

Merge "Fix typos for config-ref and ha-guide"

Browse Source
This commit is contained in:
Jenkins 2016-07-20 17:20:21 +00:00 committed by Gerrit Code Review
commit c8ab091b5e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/config-reference/source/config-format.rst
View File

@ -64,7 +64,7 @@ IP address (``IPOpt``)
bind_host = 0.0.0.0
key-value pairs (``DictOpt``)
A key-value pairs, also known as a dictonary. The key value pairs are
A key-value pairs, also known as a dictionary. The key value pairs are
separated by commas and a colon is used to separate key and value.
Example: ``key1:value1,key2:value2``.
@ -179,7 +179,7 @@ For example:
.. code-block:: ini
ldap_dns_passsword='a password with spaces'
ldap_dns_password='a password with spaces'
Define an alternate location for a config file
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
doc/ha-guide/source/controller-ha-identity.rst
View File

@ -119,7 +119,7 @@ of an OpenStack Identity server as you would do
in a non-HA environment.
#. For OpenStack Compute, for example,
if your OpenStack Identiy service IP address is 10.0.0.11,
if your OpenStack Identity service IP address is 10.0.0.11,
use the following configuration in your :file:`api-paste.ini` file:
.. code-block:: ini

2
doc/ha-guide/source/intro-ha-controller.rst
View File

@ -39,7 +39,7 @@ and expected SLA.]
See :doc:`networking-ha` for more information about configuring
Networking for high availability.
Common deployement architectures
Common deployment architectures
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There are primarily two HA architectures in use today.

2
doc/ha-guide/source/networking-ha.rst
View File

@ -14,7 +14,7 @@ Notes from planning outline:
we should simply mention physical network HA methods
such as bonding and additional node/network requirements
for L3HA and DVR for planning purposes.
- Neutron agents shuld be described for active/active;
- Neutron agents should be described for active/active;
deprecate single agent's instances case.
- For Kilo and beyond, focus on L3HA and DVR.
- Link to `OpenStack Networking Guide <http://docs.openstack.org/networking-guide/>`_

2
doc/ha-guide/source/shared-database-configure.rst
View File

@ -115,7 +115,7 @@ steps on each cluster node:
# firewall-cmd --add-port=4568/tcp
# firewall-cmd --add-port=4444/tcp
In the event that you also want to configure mutlicast replication,
In the event that you also want to configure multicast replication,
run this command as well:
.. code-block:: console