Skip to content

Synchronise master with upstream #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 3 commits into from
Aug 11, 2025
Merged

Synchronise master with upstream #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d213dba
use current debian version supported by kolla
bbezak Aug 4, 2025
24b975f
public-openrc: avoid duplicate OS_CACERT
bbezak Jul 10, 2025
adab346
Merge "use current debian version supported by kolla"
Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/inventory/group_vars/all/kolla
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ kolla_base_distro: "{{ os_distribution }}"
# Defines default versions for each distribution.
kolla_base_distro_version_default_map: {
"centos": "stream9",
"debian": "bullseye",
"debian": "bookworm",
"rocky": "9",
"ubuntu": "noble",
}
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/public-openrc/templates/public-openrc.sh.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/bug-2116318-44f0c022cde1e686.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>`__