From f4743b28e9092d169707d66ee1b2e11c66228ca4 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 1 Oct 2026 12:40:35 +0200 Subject: [PATCH 1/3] Fix diff mode for AlliedWare Plus switches Change-Id: If236e707d4f1ee9e22d5b9c35eb1369b290ec885 Signed-off-by: Pierre Riteau (cherry picked from commit 080b1979f9189288b1f0762715ee32ee80df57a9) --- ansible/roles/alliedware-plus-switch/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/alliedware-plus-switch/tasks/main.yml b/ansible/roles/alliedware-plus-switch/tasks/main.yml index ceb0d434c..be27a7d10 100644 --- a/ansible/roles/alliedware-plus-switch/tasks/main.yml +++ b/ansible/roles/alliedware-plus-switch/tasks/main.yml @@ -1,6 +1,7 @@ --- - name: Ensure AlliedWare Plus switches are configured alliedtelesis.awplus.awplus_config: + diff_against: "running" lines: "{{ lookup('template', 'alliedware-plus-config.j2') }}" save_when: >- {{ alliedware_plus_switch_save | bool | ternary('modified', 'never') }} From 4a32a253afcfc108ab18a7c4fb5b1159a1b5ded1 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 7 Oct 2026 23:45:53 +0200 Subject: [PATCH 2/3] CI: Remove SLURP upgrade jobs from 2024.1 to 2025.1 The 2024.1 release will soon be EOL in the Kolla project. 2024.1-rocky-9 images have disappeared from quay.io and are causing these upgrade jobs to fail on the 2025.1 branch. Change-Id: I1b2638b34880af3b25e9d00bfd3c97a8af8d0e56 Signed-off-by: Pierre Riteau --- zuul.d/project.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 6db47b394..1ab792cf3 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -28,15 +28,12 @@ - kayobe-overcloud-tls-rocky9 - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - - kayobe-overcloud-upgrade-slurp-rocky9 - - kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-seed-rocky10 - kayobe-seed-rocky10-podman - kayobe-seed-rocky9 - kayobe-seed-rocky9-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - - kayobe-seed-upgrade-slurp-rocky9 - kayobe-seed-vm-rocky10 - kayobe-seed-vm-rocky9 - kayobe-seed-vm-ubuntu-noble @@ -62,15 +59,12 @@ - kayobe-overcloud-tls-rocky9 - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - - kayobe-overcloud-upgrade-slurp-rocky9 - - kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-seed-rocky10 - kayobe-seed-rocky10-podman - kayobe-seed-rocky9 - kayobe-seed-rocky9-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - - kayobe-seed-upgrade-slurp-rocky9 - kayobe-seed-vm-rocky10 - kayobe-seed-vm-rocky9 - kayobe-seed-vm-ubuntu-noble From 8f793cfc01c6ef5c4846a72a691982f1d90e6952 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 5 Oct 2026 21:23:18 +0200 Subject: [PATCH 3/3] Revert "CI: Prefer ipv4 over ipv6" This reverts commit 3aef916669812d61c2c51a129b13f034c1205cf1. Reason for revert: IPv6 is fixed in ca-ymq-1 region Change-Id: Ie91a072a05c9345483c03b6038a2547ead8d519c Signed-off-by: Pierre Riteau --- roles/kayobe-ci-prep/tasks/main.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/roles/kayobe-ci-prep/tasks/main.yml b/roles/kayobe-ci-prep/tasks/main.yml index 9e6b116ee..11847e719 100644 --- a/roles/kayobe-ci-prep/tasks/main.yml +++ b/roles/kayobe-ci-prep/tasks/main.yml @@ -1,13 +1,4 @@ --- -# NOTE: prefer IPv4 over IPv6 in getaddrinfo() to avoid slow/failing AAAA -# lookups against hosts without real IPv6 connectivity -- name: Prefer IPv4 over IPv6 for name resolution - become: true - ansible.builtin.lineinfile: - path: /etc/gai.conf - line: "precedence ::ffff:0:0/96 100" - create: true - - name: Configure secondary storage drive #NOTE(wszumski) Some instances provide a smaller 40G root disk with a #secondary storage drive. This kolla-ansible provided role sets up the