diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-09 21:14:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-09 21:14:49 +0000 |
| commit | 395bb2e3aa050c209a2c49920926a80a1ab8441d (patch) | |
| tree | 16169c4cb4d035f622da2bc2011a95122d381d18 /doc | |
| parent | c122b2f11850df490a9ef5ce6ad56daca8d857f3 (diff) | |
| parent | 8af51c7af6e7a75cd804bdbea5ba46c708ef5ff7 (diff) | |
| download | kolla-395bb2e3aa050c209a2c49920926a80a1ab8441d.tar.gz kolla-395bb2e3aa050c209a2c49920926a80a1ab8441d.zip | |
Merge "Fix a few small typos and formatting."
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/advanced-configuration.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst index 12465f1f2..6fe857fb2 100644 --- a/doc/advanced-configuration.rst +++ b/doc/advanced-configuration.rst @@ -10,7 +10,7 @@ URL, and the external URL. Kolla offers two options for assigning these endpoints to network addresses. These are combined and separate. For the combined option, all three endpoints share the same IP address. For the separate option, the external -URL is assigned to an IP address that is different that the IP address +URL is assigned to an IP address that is different than the IP address shared by the internal and admin URLs. The configuration parameters related to these options are: @@ -47,6 +47,7 @@ deployment use the variables: - kolla_internal_fqdn - kolla_external_fqdn :: + kolla_internal_fqdn: inside.mykolla.example.net kolla_external_fqdn: mykolla.example.net @@ -78,7 +79,7 @@ The default for TLS is disabled; to enable TLS networking: .. NOTE:: TLS authentication is based on certificates that have been signed by trusted Certificate Authorities. Examples of commercial CAs are Comodo, Symantec, GoDaddy, and GlobalSign. Letsencrypt.org - is a CA that will provided trusted certificates at no charge. Many + is a CA that will provide trusted certificates at no charge. Many company's IT departments will provide certificates within that company's domain. If using a trusted CA is not possible for your situation, you can use OpenSSL to create your own or see the section |