Skip to content

Commit bfeac9a

Browse files
committed
Feedback from Mark
1 parent c05020a commit bfeac9a

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

source/operations_and_monitoring.rst

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ Installing TLS Certificates
118118

119119
|tls_setup|
120120

121-
To configure TLS for the first time, we write a PEM file to the ``secrets.yml``
122-
file as ``secrets_kolla_external_tls_cert``. Use a command of this form:
121+
To configure TLS for the first time, we write the contents of a PEM
122+
file to the ``secrets.yml`` file as ``secrets_kolla_external_tls_cert``.
123+
Use a command of this form:
123124

124125
.. code-block:: console
125126
:substitutions:
@@ -141,13 +142,26 @@ In ``${KAYOBE_CONFIG_PATH}/kolla.yml``, set the following:
141142
kolla_enable_tls_external: True
142143
kolla_external_tls_cert: "{{ secrets_kolla_external_tls_cert }}"
143144
144-
To configure TLS, we need to reconfigure all services, as endpoint URLs need to
145+
To apply TLS configuration, we need to reconfigure all services, as endpoint URLs need to
145146
be updated in Keystone:
146147

147148
.. code-block:: console
148149
149150
kayobe# kayobe overcloud service reconfigure
150151
152+
Alternative Configuration
153+
+++++++++++++++++++++++++
154+
155+
As an alternative to writing the certificates as a variable to
156+
``secrets.yml``, it is also possible to write the same data to a file,
157+
``etc/kayobe/kolla/certificates/haproxy.pem``. The file should be
158+
vault-encrypted in the same manner as secrets.yml. In this instance,
159+
variable ``kolla_enable_tls_cert`` does not need to be defined.
160+
161+
See `Kolla-Ansible TLS guide
162+
<https://docs.openstack.org/kolla-ansible/latest/admin/tls.html>`__ for
163+
further details.
164+
151165
Updating TLS Certificates
152166
-------------------------
153167

@@ -159,7 +173,7 @@ reach the |project_name| OpenStack APIs:
159173
160174
openstack# openssl s_client -connect |public_endpoint_fqdn|:443 2> /dev/null | openssl x509 -noout -dates
161175
162-
*NOTE*: Blackbox monitoring can check certificates automatically
176+
*NOTE*: Prometheus Blackbox monitoring can check certificates automatically
163177
and alert when expiry is approaching.
164178

165179
To update an existing certificate, for example when it has reached expiration,

0 commit comments

Comments
 (0)