Skip to content

Commit 6f83a17

Browse files
bbezakpriteau
authored andcommitted
public-openrc: avoid duplicate OS_CACERT
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 <[email protected]> (cherry picked from commit 24b975f)
1 parent af5b2ca commit 6f83a17

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

ansible/roles/public-openrc/templates/public-openrc.sh.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ export OS_ENDPOINT_TYPE=publicURL
1111
export OS_MANILA_ENDPOINT_TYPE=publicURL
1212
{% elif "export OS_MISTRAL_ENDPOINT_TYPE" in line %}
1313
export OS_MISTRAL_ENDPOINT_TYPE=publicURL
14+
{% elif "export OS_CACERT" in line %}
15+
{# NOTE(bbezak): drop admin OS_CACERT; public-openrc sets its own. -#}
1416
{% else %}
1517
{{ line }}
1618
{% endif %}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes duplicate ``OS_CACERT`` lines in ``public-openrc.sh`` when both admin
5+
and public cacert variables are set.
6+
`LP#2116318 <https://bugs.launchpad.net/kayobe/+bug/2116318>`__

0 commit comments

Comments
 (0)