From 3f858276f40fc1e296eab482ffc9b12175962c26 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 3 Jun 2026 20:24:09 +0200 Subject: [PATCH 1/2] CI: Remove override-checkout for stable/2026.1 Change-Id: Ifc1a1bbf257d87da8096a3f41a2e7a162f836642 Signed-off-by: Pierre Riteau --- zuul.d/jobs.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2b889a470..2687d1be0 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -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: - ^\..+ From 2f4d55f3d42caec8d5d863a659415556ba8e48af Mon Sep 17 00:00:00 2001 From: Jed Preist Date: Wed, 1 Jul 2026 10:33:31 +0100 Subject: [PATCH 2/2] Fix kolla inventory hostname formatting Change the overcloud-top-level jinja template to be less aggressive removing whitespace, so that it doesn't remove the newlines between hosts in a group. Closes-Bug: #2158773 Change-Id: Icd3730c50acc9f8f72cb3651b7e099e5eaae6973 Signed-off-by: Jed Preist (cherry picked from commit 61baaf7183b99739a2d5abb886df0a26b83f7716) --- .../roles/kolla-ansible/templates/overcloud-top-level.j2 | 2 +- .../notes/fix-overcloud-hosts-ad452b432ac2a304.yaml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml diff --git a/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2 b/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2 index ee11d9417..d1cf2f806 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-top-level.j2 @@ -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 %} diff --git a/releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml b/releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml new file mode 100644 index 000000000..c0ccc524b --- /dev/null +++ b/releasenotes/notes/fix-overcloud-hosts-ad452b432ac2a304.yaml @@ -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 `__