aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKenny Johnston <kencjohnston@gmail.com>2016-07-25 22:10:33 -0500
committerKenny Johnston <kencjohnston@gmail.com>2016-10-02 21:15:53 -0500
commitb9921dabee3d1c03065423f60d1b5d3c3dbf092c (patch)
tree6c01e7a238b0cd5bf7913366922b617f4e889bcd /doc
parent99e65fda54b3daa55545decd7a80502e63c829d9 (diff)
downloadkolla-b9921dabee3d1c03065423f60d1b5d3c3dbf092c.tar.gz
kolla-b9921dabee3d1c03065423f60d1b5d3c3dbf092c.zip
Readability Improvements to Advanced Config Doc
Formatting and readability adjustments to advanced-configuration.rst. Change-Id: Ifc963316158b093fcb1a75fbfca16437646a2e1e
Diffstat (limited to 'doc')
-rw-r--r--doc/advanced-configuration.rst20
1 files changed, 13 insertions, 7 deletions
diff --git a/doc/advanced-configuration.rst b/doc/advanced-configuration.rst
index a91c01afe..cf5bb14f7 100644
--- a/doc/advanced-configuration.rst
+++ b/doc/advanced-configuration.rst
@@ -11,11 +11,10 @@ When an OpenStack cloud is deployed, each services' REST API is presented
as a series of endpoints. These endpoints are the admin URL, the internal
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 than the IP address
-shared by the internal and admin URLs.
+Kolla offers two options for assigning these endpoints to network addresses:
+ - Combined - Where all three endpoints share the same IP address
+ - Separate - Where the external 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:
- kolla_internal_vip_address
@@ -90,6 +89,8 @@ The default for TLS is disabled; to enable TLS networking:
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
+ 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
below about kolla generated self-signed certificates.
Two certificate files are required to use TLS securely with authentication.
@@ -116,6 +117,8 @@ have settings similar to this:
export OS_CACERT=/etc/pki/mykolla-cacert.crt
export OS_IDENTITY_API_VERSION=3
+.. _OpenSSL: https://www.openssl.org/
+
Self-Signed Certificates
========================
@@ -148,6 +151,11 @@ OpenStack Service Configuration in Kolla
An operator can change the location where custom config files are read
from by editing ``/etc/kolla/globals.yml`` and adding the following
line.
+=======
+.. NOTE:: As of now kolla only supports config overrides for ini based configs.
+
+An operator can change the location where custom config files are read from by
+editing ``/etc/kolla/globals.yml`` and adding the following line.
::
@@ -216,11 +224,9 @@ It is sometimes required to use a different than default port
for service(s) in Kolla. It is possible with setting <service>_port
in ``globals.yml`` file.
For example:
-
::
database_port: 3307
As <service>_port value is saved in different services' configurationso
it's advised to make above change before deploying.
-