Skip to content

Synchronise 2026.1 with upstream #587

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
Jul 6, 2026
Merged

Synchronise 2026.1 with upstream #587

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
3f85827
CI: Remove override-checkout for stable/2026.1
priteau Jun 3, 2026
6edd104
Merge "CI: Remove override-checkout for stable/2026.1" into stable/20…
Jun 30, 2026
2f4d55f
Fix kolla inventory hostname formatting
TBExtent Jul 1, 2026
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/roles/kolla-ansible/templates/overcloud-top-level.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{% for host in groups.get(group, []) %}
{%- if hostvars[host].kolla_overcloud_inventory_pass_through_enabled | default(true) | bool -%}
{{ host }}
{%- endif -%}
{% endif -%}
{% endfor %}

{% endfor %}
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Fix all hostnames in a group being merged into a single line in the kolla
overcloud hosts inventory file.
`LP#2158773 <https://bugs.launchpad.net/kayobe/+bug/2158773>`__
8 changes: 0 additions & 8 deletions zuul.d/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,11 @@
required-projects:
# Include kayobe to ensure other projects can use this job.
- name: openstack/ansible-collection-kolla
# TODO(wszumski): Remove when kayobe stable/2026.1 exists.
override-checkout: stable/2026.1
- name: openstack/kayobe
- name: openstack/kayobe-config-dev
- name: openstack/kolla
# TODO(wszumski): Remove when kayobe stable/2026.1 exists.
override-checkout: stable/2026.1
- name: openstack/kolla-ansible
# TODO(wszumski): Remove when kayobe stable/2026.1 exists.
override-checkout: stable/2026.1
- name: openstack/requirements
# TODO(wszumski): Remove when kayobe stable/2026.1 exists.
override-checkout: stable/2026.1
- name: openstack/tenks
irrelevant-files:
- ^\..+
Expand Down