aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-02-07 17:33:49 +0000
committerGerrit Code Review <review@openstack.org>2020-02-07 17:33:49 +0000
commit42000897166fdd2c4c1abfc784fdc21e04bf575f (patch)
tree985a76623875a9aa133c3193a58068e41909dc60 /doc
parentc108e07db995bc9f184deba363a975dfedb0fc8e (diff)
parentd100904f2c42dea3338e5016c46014ee3132807c (diff)
downloadkolla-ansible-42000897166fdd2c4c1abfc784fdc21e04bf575f.tar.gz
kolla-ansible-42000897166fdd2c4c1abfc784fdc21e04bf575f.zip
Merge "Generate self signed TLS certificates"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/admin/advanced-configuration.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/source/admin/advanced-configuration.rst b/doc/source/admin/advanced-configuration.rst
index 9d5b52ed2..765ed2f69 100644
--- a/doc/source/admin/advanced-configuration.rst
+++ b/doc/source/admin/advanced-configuration.rst
@@ -140,7 +140,7 @@ have settings similar to this:
export OS_PASSWORD=demo-password
export OS_AUTH_URL=https://mykolla.example.net:5000
# os_cacert is optional for trusted certificates
- export OS_CACERT=/etc/pki/mykolla-cacert.crt
+ export OS_CACERT=/etc/pki/ca/mykolla-cacert.crt
export OS_IDENTITY_API_VERSION=3
Self-Signed Certificates
@@ -162,8 +162,9 @@ configuration file:
kolla-ansible certificates
-The files haproxy.pem and haproxy-ca.pem will be generated and stored
-in the ``/etc/kolla/certificates/`` directory.
+The certificate file haproxy.pem will be generated and stored in the
+``/etc/kolla/certificates/`` directory, and the CA cert will be in the
+``/etc/kolla/certificates/ca/`` directory.
Adding CA Certificates to the Service Containers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~