openstack/kolla-ansible
Code Issues Proposed changes

Merge "Readability Improvements to Advanced Config Doc"

Browse Source
This commit is contained in:
Jenkins 2016-10-13 16:43:59 +00:00 committed by Gerrit Code Review
commit bee5f06351
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/advanced-configuration.rst
View File

@ -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 as a series of endpoints. These endpoints are the admin URL, the internal
URL, and the external URL. URL, and the external URL.
Kolla offers two options for assigning these endpoints to network addresses. Kolla offers two options for assigning these endpoints to network addresses:
These are combined and separate. For the combined option, all three - Combined - Where all three endpoints share the same IP address
endpoints share the same IP address. For the separate option, the external - Separate - Where the external URL is assigned to an IP address that is
URL is assigned to an IP address that is different than the IP address different than the IP address shared by the internal and admin URLs
shared by the internal and admin URLs.
The configuration parameters related to these options are: The configuration parameters related to these options are:
- kolla_internal_vip_address - 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 IT departments will provide certificates within that
company's domain. If using a trusted CA is not possible for your 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 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. below about kolla generated self-signed certificates.
Two certificate files are required to use TLS securely with authentication. 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_CACERT=/etc/pki/mykolla-cacert.crt
export OS_IDENTITY_API_VERSION=3 export OS_IDENTITY_API_VERSION=3
.. _OpenSSL: https://www.openssl.org/
Self-Signed Certificates Self-Signed Certificates
======================== ========================
@ -144,6 +147,11 @@ OpenStack Service Configuration in Kolla
An operator can change the location where custom config files are read An operator can change the location where custom config files are read
from by editing ``/etc/kolla/globals.yml`` and adding the following from by editing ``/etc/kolla/globals.yml`` and adding the following
line. 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.
:: ::
@ -212,11 +220,9 @@ It is sometimes required to use a different than default port
for service(s) in Kolla. It is possible with setting <service>_port for service(s) in Kolla. It is possible with setting <service>_port
in ``globals.yml`` file. in ``globals.yml`` file.
For example: For example:
:: ::
database_port: 3307 database_port: 3307
As <service>_port value is saved in different services' configurationso As <service>_port value is saved in different services' configurationso
it's advised to make above change before deploying. it's advised to make above change before deploying.