openstack/kayobe
Code Issues Proposed changes

public-openrc: avoid duplicate OS_CACERT

Browse Source 
Skip the admin OS_CACERT line when rendering public-openrc.
Recent change [1] introduced that.
It occurs only when both admin and public cacert variables are set.

[1] https://review.opendev.org/c/openstack/kayobe/+/949624

Closes-Bug: #2116318

Change-Id: I29c0c6bf77e919940c3452b1f5d219462552cdff
Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
This commit is contained in:
Bartosz Bezak
2025-07-10 12:33:41 +02:00
committed by Pierre Riteau
parent 28dadfbce1
commit 24b975fe02
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,8 @@ 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 %}
{# NOTE(bbezak): drop admin OS_CACERT; public-openrc sets its own. -#}
{% else %} {% else %}
{{ line }} {{ line }}
{% endif %} {% endif %}

6
releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes duplicate ``OS_CACERT`` lines in ``public-openrc.sh`` when both admin
and public cacert variables are set.
`LP#2116318 <https://bugs.launchpad.net/kayobe/+bug/2116318>`__