From 24b975fe028deb3161463032ff6d4e13f740d3e8 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 10 Jul 2025 12:33:41 +0200 Subject: [PATCH] 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 --- ansible/roles/public-openrc/templates/public-openrc.sh.j2 | 2 ++ releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml diff --git a/ansible/roles/public-openrc/templates/public-openrc.sh.j2 b/ansible/roles/public-openrc/templates/public-openrc.sh.j2 index d11c795dd..49225fc60 100644 --- a/ansible/roles/public-openrc/templates/public-openrc.sh.j2 +++ b/ansible/roles/public-openrc/templates/public-openrc.sh.j2 @@ -11,6 +11,8 @@ export OS_ENDPOINT_TYPE=publicURL export OS_MANILA_ENDPOINT_TYPE=publicURL {% elif "export OS_MISTRAL_ENDPOINT_TYPE" in line %} export OS_MISTRAL_ENDPOINT_TYPE=publicURL +{% elif "export OS_CACERT" in line %} +{# NOTE(bbezak): drop admin OS_CACERT; public-openrc sets its own. -#} {% else %} {{ line }} {% endif %} diff --git a/releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml b/releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml new file mode 100644 index 000000000..8851717e4 --- /dev/null +++ b/releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml @@ -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 `__