openstack/kayobe
Code Issues Proposed changes

Merge "public-openrc: Add OS_CACERT even if admin-openrc lacks it"

Browse Source
This commit is contained in:
Zuul
2025-05-13 19:57:40 +00:00
committed by Gerrit Code Review
parent 25a72252c1 2393044b59
commit ce044fa2af
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/public-openrc/templates/public-openrc.sh.j2
View File

@@ -11,9 +11,10 @@ export OS_ENDPOINT_TYPE=publicURL
export OS_MANILA_ENDPOINT_TYPE=publicURL export OS_MANILA_ENDPOINT_TYPE=publicURL
{% elif "export OS_MISTRAL_ENDPOINT_TYPE" in line %} {% elif "export OS_MISTRAL_ENDPOINT_TYPE" in line %}
export OS_MISTRAL_ENDPOINT_TYPE=publicURL export OS_MISTRAL_ENDPOINT_TYPE=publicURL
{% elif "export OS_CACERT" in line and kolla_public_openrc_cacert is not none %}
export OS_CACERT={{ kolla_public_openrc_cacert }}
{% else %} {% else %}
{{ line }} {{ line }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if kolla_public_openrc_cacert is not none %}
export OS_CACERT={{ kolla_public_openrc_cacert }}
{% endif %}

6
releasenotes/notes/bug-2110549-28e47a915331af95.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes ``public-openrc.sh`` missing the ``OS_CACERT`` variable when absent
from ``admin-openrc.sh``.
`LP#2110549 <https://bugs.launchpad.net/kayobe/+bug/2110549>`__