openstack/kayobe
Code Issues Proposed changes

Merge "Prevent openrc files from using wrong OS_CACERT value"

Browse Source
This commit is contained in:
Zuul 2020-04-15 17:27:33 +00:00 committed by Gerrit Code Review
commit c31870591d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/kolla-ansible/templates/globals.yml.j2
View File

@ -184,12 +184,8 @@ kolla_enable_tls_internal: {{ kolla_enable_tls_internal | bool }}
kolla_enable_tls_external: {{ kolla_enable_tls_external | bool }} kolla_enable_tls_external: {{ kolla_enable_tls_external | bool }}
kolla_external_fqdn_cert: "{{ kolla_external_fqdn_cert }}" kolla_external_fqdn_cert: "{{ kolla_external_fqdn_cert }}"
kolla_internal_fqdn_cert: "{{ kolla_internal_fqdn_cert }}" kolla_internal_fqdn_cert: "{{ kolla_internal_fqdn_cert }}"
{% if kolla_external_fqdn_cacert %}
kolla_external_fqdn_cacert: "{{ kolla_external_fqdn_cacert }}" kolla_external_fqdn_cacert: "{{ kolla_external_fqdn_cacert }}"
{% endif %}
{% if kolla_internal_fqdn_cacert %}
kolla_internal_fqdn_cacert: "{{ kolla_internal_fqdn_cacert }}" kolla_internal_fqdn_cacert: "{{ kolla_internal_fqdn_cacert }}"
{% endif %}
################ ################
# Region options # Region options

8
releasenotes/notes/prevent-wrong-oscacert-variable-9ede7f60c1562a77.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Fixes an issue where ``OS_CACERT`` variable in ``openrc`` files would be
set to the path of a non-existent file. New ``openrc`` files can be
generated with the ``kayobe control host bootstrap`` command. `See story
2007516 <https://storyboard.openstack.org/#!/story/2007516>`_ for more
details.