From a8635f89bcee9032594fd0da23db32dda8e9c0cf Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Wed, 11 Mar 2026 10:24:21 +0000 Subject: [PATCH 01/11] Hide sensitive inspector rules from ansible output Set no_log: true on inspector rule loop items that are marked sensitive. Add the ironic_inspector_sensitive_rule_no_log variable to change the default behaviour to not log sensitive inspector rules. Change-Id: I47035e2d1625fe7e95f29919d59676ea0cc9ee67 Closes-Bug: #2143889 Signed-off-by: Matt Anson Signed-off-by: Matt Crees --- ansible/inventory/group_vars/all/inspector | 3 +++ ansible/roles/ironic-inspector-rules/defaults/main.yml | 3 +++ ansible/roles/ironic-inspector-rules/tasks/main.yml | 5 +++++ etc/kayobe/inspector.yml | 3 +++ .../no-log-sensitive-inspector-rules-6d6edfcae25feb82.yaml | 4 ++++ 5 files changed, 18 insertions(+) create mode 100644 releasenotes/notes/no-log-sensitive-inspector-rules-6d6edfcae25feb82.yaml diff --git a/ansible/inventory/group_vars/all/inspector b/ansible/inventory/group_vars/all/inspector index b65faaf80..b26110112 100644 --- a/ansible/inventory/group_vars/all/inspector +++ b/ansible/inventory/group_vars/all/inspector @@ -114,6 +114,9 @@ inspector_rule_var_redfish_password: # Redfish CA setting. inspector_rule_var_redfish_verify_ca: True +# Log Ironic inspector rules marked sensitive. +ironic_inspector_sensitive_rule_no_log: True + # Ironic inspector rule to set IPMI credentials. inspector_rule_ipmi_credentials: description: "Set IPMI driver_info if no credentials" diff --git a/ansible/roles/ironic-inspector-rules/defaults/main.yml b/ansible/roles/ironic-inspector-rules/defaults/main.yml index fd36cc0cf..fb8541fe7 100644 --- a/ansible/roles/ironic-inspector-rules/defaults/main.yml +++ b/ansible/roles/ironic-inspector-rules/defaults/main.yml @@ -23,3 +23,6 @@ ironic_inspector_interface: # List of rules which should exist. See the Inspector rules API for details of # parameters available for rules. ironic_inspector_rules: [] + +# Set no_log for inspector rules marked sensitive +ironic_inspector_sensitive_rule_no_log: diff --git a/ansible/roles/ironic-inspector-rules/tasks/main.yml b/ansible/roles/ironic-inspector-rules/tasks/main.yml index 41a1aab7e..d89a77555 100644 --- a/ansible/roles/ironic-inspector-rules/tasks/main.yml +++ b/ansible/roles/ironic-inspector-rules/tasks/main.yml @@ -16,4 +16,9 @@ state: present loop_control: label: "{{ ironic_inspector_rules[item].description }}" + no_log: >- + {{ + (ironic_inspector_rules[item].sensitive | default(False)) + and ironic_inspector_sensitive_rule_no_log + }} with_items: "{{ range(0, ironic_inspector_rules | length) | list }}" diff --git a/etc/kayobe/inspector.yml b/etc/kayobe/inspector.yml index 926316b71..a39242a37 100644 --- a/etc/kayobe/inspector.yml +++ b/etc/kayobe/inspector.yml @@ -98,6 +98,9 @@ # Redfish CA setting. Set to 'True' by default #inspector_rule_var_redfish_verify_ca: +# Log Ironic inspector rules marked sensitive. Set to 'True' by default +#ironic_inspector_sensitive_rule_no_log: + # Ironic inspector rule to set IPMI credentials. #inspector_rule_ipmi_credentials: diff --git a/releasenotes/notes/no-log-sensitive-inspector-rules-6d6edfcae25feb82.yaml b/releasenotes/notes/no-log-sensitive-inspector-rules-6d6edfcae25feb82.yaml new file mode 100644 index 000000000..f1548210b --- /dev/null +++ b/releasenotes/notes/no-log-sensitive-inspector-rules-6d6edfcae25feb82.yaml @@ -0,0 +1,4 @@ +--- +security: + - | + Prevents sensitive inspector rules from appearing in ansible output. From 6fb103fd5dec1a7782af2a440c47df3b3c110fdc Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Wed, 25 Jun 2025 14:01:34 +0100 Subject: [PATCH 02/11] Add custom_etc_hosts_entries variable ``custom_etc_hosts_entries`` is a new variable which provides a generic way to add entries to ``/etc/hosts``. It differs from ``etc_hosts_hosts`` because it is empty by default and can be used to add hosts that are not in the Kayobe inventory. ``custom_etc_hosts_entries`` is a dictionary where each key is a hostname and each value is an IP address. Change-Id: I74c8234f77115d6a478559a53ad86534eb12e5f4 Signed-off-by: Alex Welsh --- ansible/roles/etc-hosts/defaults/main.yml | 5 +++++ ansible/roles/etc-hosts/tasks/etc-hosts.yml | 3 +++ doc/source/configuration/reference/hosts.rst | 9 +++++++++ .../overrides.yml.j2 | 4 ++++ .../tests/test_overcloud_host_configure.py | 7 +++++++ .../notes/custom-etc-hosts-f85fcff9aac727aa.yaml | 8 ++++++++ 6 files changed, 36 insertions(+) create mode 100644 releasenotes/notes/custom-etc-hosts-f85fcff9aac727aa.yaml diff --git a/ansible/roles/etc-hosts/defaults/main.yml b/ansible/roles/etc-hosts/defaults/main.yml index abc8435f6..3d880182b 100644 --- a/ansible/roles/etc-hosts/defaults/main.yml +++ b/ansible/roles/etc-hosts/defaults/main.yml @@ -4,3 +4,8 @@ customize_etc_hosts: true # List of hosts to add to /etc/hosts. etc_hosts_hosts: "{{ groups['overcloud'] }}" + +# Dictionary of custom /etc/hosts entries. +# Each key is added as a hostname, +# Each value is added as an IP. +custom_etc_hosts_entries: {} diff --git a/ansible/roles/etc-hosts/tasks/etc-hosts.yml b/ansible/roles/etc-hosts/tasks/etc-hosts.yml index 19b45db51..59680a226 100644 --- a/ansible/roles/etc-hosts/tasks/etc-hosts.yml +++ b/ansible/roles/etc-hosts/tasks/etc-hosts.yml @@ -31,6 +31,9 @@ {{ hostvars[host].internal_net_name | net_ip(inventory_hostname=host) }} {{ hostnames | unique | join(' ') }} {% endif %} {% endfor %} + {% for item in custom_etc_hosts_entries | dict2items %} + {{ item.value }} {{ item.key }} + {% endfor %} become: True when: # Skip hosts that do not have a valid internal network interface. diff --git a/doc/source/configuration/reference/hosts.rst b/doc/source/configuration/reference/hosts.rst index da2a1467f..94f08c895 100644 --- a/doc/source/configuration/reference/hosts.rst +++ b/doc/source/configuration/reference/hosts.rst @@ -1534,6 +1534,15 @@ follows: etc_hosts_gather_facts: false +Custom entries can be added to the ``custom_etc_hosts_entries`` dictionary. +Each key is treated as a hostname and each value is the IP, for example: + +.. code-block:: yaml + + custom_etc_hosts_entries: + foo.exaple.com: 1.2.3.4 + bar.exaple.com: 5.6.7.8 + Installing packages required by Kolla Ansible ============================================= *tags:* diff --git a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 index b0e4cd21d..b3fd5fcd8 100644 --- a/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-host-configure-base/overrides.yml.j2 @@ -231,3 +231,7 @@ compute_libvirt_sasl_password: "{% raw %}{{ lookup('password', '/tmp/libvirt-sas dnf_use_local_mirror: true controller_fail2ban_enabled: true {% endif %} + +# Add a custom entry to /etc/hosts. +custom_etc_hosts_entries: + foo.example.com: 127.0.0.88 diff --git a/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py b/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py index f8e394909..977fbc89e 100644 --- a/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py +++ b/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py @@ -374,3 +374,10 @@ def test_swap(host): assert len(swapon) > 1 swap_devs = [swap.split()[0] for swap in swapon[1:]] assert "/swapfile" in swap_devs + + +def test_etc_hosts(host): + hosts_entries = host.check_output("cat /etc/hosts") + assert "127.0.0.88 foo.example.com" in hosts_entries + ping_result = host.check_output("ping -c 1 foo.example.com") + assert "1 received" in ping_result diff --git a/releasenotes/notes/custom-etc-hosts-f85fcff9aac727aa.yaml b/releasenotes/notes/custom-etc-hosts-f85fcff9aac727aa.yaml new file mode 100644 index 000000000..a720d0f3d --- /dev/null +++ b/releasenotes/notes/custom-etc-hosts-f85fcff9aac727aa.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + Added a new variable, ``custom_etc_hosts_entries``, for appending entries + to ``/etc/hosts``. This is a generic mechanism which, unlike + ``etc_hosts_hosts``, can be used to add hosts outside of the Kayobe + inventory. ``custom_etc_hosts_entries`` is a dictionary, where each key is + a hostname and each value is an IP. From e4f5c4cfbcfc828f336db7329acb4534e388f177 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 2 Apr 2026 22:32:20 +0200 Subject: [PATCH 03/11] CI: Replace use of deprecated ansible-lint option Deprecated `-p` cli option replaced with current `--format=pep8` option. This alias will be removed in a future release. Change-Id: If779c14ab85df03f61f4e9e025f0fadb0dfb28ff Signed-off-by: Pierre Riteau --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ed74876cd..71ce94a0d 100644 --- a/tox.ini +++ b/tox.ini @@ -92,7 +92,7 @@ commands = setenv = {[testenv:linters]setenv} deps = {[testenv:linters]deps} commands = - ansible-lint -p --exclude etc --exclude kayobe/plugins --exclude playbooks --exclude releasenotes --exclude roles --exclude zuul.d --exclude ansible/idrac-bootstrap.yml --exclude .ansible --exclude ansible/roles/*.* --exclude ansible/collections + ansible-lint -f pep8 --exclude etc --exclude kayobe/plugins --exclude playbooks --exclude releasenotes --exclude roles --exclude zuul.d --exclude ansible/idrac-bootstrap.yml --exclude .ansible --exclude ansible/roles/*.* --exclude ansible/collections [testenv:ansible-syntax] commands = From 290694c0feb523a85b4812c7625a6ec2f6698a45 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Tue, 7 Apr 2026 11:32:16 +0100 Subject: [PATCH 04/11] Correct reno for kolla tags/limit deprecation Change-Id: Id9c82753c3e418bc497f69ab404f1c8c18830ebc Signed-off-by: Matt Crees --- ...ags-and-kolla-limits-254faef5584176e1.yaml | 22 +++++++++++++++++++ ...ags-and-kolla-limits-254faef5584176e1.yaml | 22 ------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 releasenotes/notes/deprecate-kolla-tags-and-kolla-limits-254faef5584176e1.yaml delete mode 100644 releasenotes/notes/drop-kolla-tags-and-kolla-limits-254faef5584176e1.yaml diff --git a/releasenotes/notes/deprecate-kolla-tags-and-kolla-limits-254faef5584176e1.yaml b/releasenotes/notes/deprecate-kolla-tags-and-kolla-limits-254faef5584176e1.yaml new file mode 100644 index 000000000..6783f5e47 --- /dev/null +++ b/releasenotes/notes/deprecate-kolla-tags-and-kolla-limits-254faef5584176e1.yaml @@ -0,0 +1,22 @@ +--- +features: + - | + Added the tag ``bifrost`` to ``kolla-bifrost.yml`` so that we can easily + limit to Bifrost in ``kayobe seed service deploy``. + - | + Deprecated the options ``--kolla-tags`` and ``kolla-limit`` for all + commands. Regular ``--tags`` and ``--limit`` will now be passed directly to + the Kolla-Ansible invocations. Added the tag ``kayobe-generate-config`` to + ``kolla-ansible.yml`` and ``kolla-openstack.yml``. This tag is now always + called, to allow for limiting to OpenStack services with just one tag, e.g. + ``kayobe overcloud service deploy -t nova``. You can still skip this with + ``--skip-tags kayobe-generate-config``. +upgrade: + - | + Deprecated the options ``--kolla-tags`` and ``kolla-limit`` for all + commands. Regular ``--tags`` and ``--limit`` will now be passed directly to + the Kolla-Ansible invocations. Added the tag ``kayobe-generate-config`` to + ``kolla-ansible.yml`` and ``kolla-openstack.yml``. This tag is now always + called, to allow for limiting to OpenStack services with just one tag, e.g. + ``kayobe overcloud service deploy -t nova``. You can still skip this with + ``--skip-tags kayobe-generate-config``. diff --git a/releasenotes/notes/drop-kolla-tags-and-kolla-limits-254faef5584176e1.yaml b/releasenotes/notes/drop-kolla-tags-and-kolla-limits-254faef5584176e1.yaml deleted file mode 100644 index 854451fbd..000000000 --- a/releasenotes/notes/drop-kolla-tags-and-kolla-limits-254faef5584176e1.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -features: - - | - Added the tag ``bifrost`` to ``kolla-bifrost.yml`` so that we can easily - limit to Bifrost in ``kayobe seed service deploy``. - - | - Removed the options ``--kolla-tags`` and ``kolla-limit`` from all commands. - Regular ``--tags`` and ``--limit`` will now be passed directly to the - Kolla-Ansible invocations. Added the tag ``kayobe-generate-config`` to - ``kolla-ansible.yml`` and ``kolla-openstack.yml``. This tag is now always - called, to allow for limiting to OpenStack services with just one tag, e.g. - ``kayobe overcloud service deploy -t nova`. You can still skip this with - ``--skip-tags kayobe-generate-config``. -upgrade: - - | - Removed the options ``--kolla-tags`` and ``kolla-limit`` from all commands. - Regular ``--tags`` and ``--limit`` will now be passed directly to the - Kolla-Ansible invocations. Added the tag ``kayobe-generate-config`` to - ``kolla-ansible.yml`` and ``kolla-openstack.yml``. This tag is now always - called, to allow for limiting to OpenStack services with just one tag, e.g. - ``kayobe overcloud service deploy -t nova`. You can still skip this with - ``--skip-tags kayobe-generate-config``. From e239550683ce591b820d54c68833f7cac3f53eaf Mon Sep 17 00:00:00 2001 From: Owen Jones Date: Thu, 2 Apr 2026 15:22:33 +0100 Subject: [PATCH 05/11] Add support for building valkey images Add support for building valkey images when `kolla_enable_valkey` is set to true (default false). Change-Id: I62e7a984c41295bf5a24ef6693b474528823f4eb Signed-off-by: Owen Jones --- ansible/inventory/group_vars/all/kolla | 3 +++ releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml diff --git a/ansible/inventory/group_vars/all/kolla b/ansible/inventory/group_vars/all/kolla index 411b116e6..dfdd4f6b6 100644 --- a/ansible/inventory/group_vars/all/kolla +++ b/ansible/inventory/group_vars/all/kolla @@ -256,6 +256,8 @@ overcloud_container_image_regex_map: enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}" - regex: ^trove enabled: "{{ kolla_enable_trove | bool }}" + - regex: ^valkey + enabled: "{{ kolla_enable_valkey | bool }}" - regex: ^watcher enabled: "{{ kolla_enable_watcher | bool }}" - regex: ^zun @@ -580,6 +582,7 @@ kolla_enable_swift: "no" kolla_enable_tacker: "no" kolla_enable_telegraf: "no" kolla_enable_trove: "no" +kolla_enable_valkey: "no" kolla_enable_vitrage: "no" kolla_enable_watcher: "no" kolla_enable_zun: "no" diff --git a/releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml b/releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml new file mode 100644 index 000000000..1d6534477 --- /dev/null +++ b/releasenotes/notes/build-valkey-image-7b4ff265ecb5aba5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + ``valkey`` images are now built when ``kolla_enable_valkey`` is set to + ``true``. From d39e3fa14dfb7c01fb4dc7cff672c5e004168aba Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 10 Apr 2026 14:20:42 +0100 Subject: [PATCH 06/11] Make rocky slurp upgrade jobs non-voting We will fix this is in a follow up and revert. Change-Id: I7db182ba976c03c3aa14e34b7bf63787986a83c5 Signed-off-by: Will Szumski --- zuul.d/jobs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 042114e69..b5ce168cf 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -200,6 +200,7 @@ name: kayobe-overcloud-upgrade-slurp-rocky10 parent: kayobe-overcloud-upgrade-base nodeset: kayobe-rocky10-16GB + voting: false - job: name: kayobe-overcloud-upgrade-slurp-ubuntu-noble @@ -352,6 +353,7 @@ name: kayobe-seed-upgrade-slurp-rocky10 parent: kayobe-seed-upgrade-base nodeset: kayobe-rocky10 + voting: false - job: name: kayobe-seed-upgrade-slurp-ubuntu-noble From a125d03c91e4cb8bda2651ec9422cadd28f0554c Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 10 Apr 2026 20:03:49 +0200 Subject: [PATCH 07/11] CI: Make all rocky upgrade jobs non-voting We will fix this is in a follow up and revert. Change-Id: Ia05a4e1bafb19e630aafba05a7b3c9e33b472600 Signed-off-by: Pierre Riteau --- zuul.d/jobs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b5ce168cf..8d081aafe 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -190,6 +190,7 @@ name: kayobe-overcloud-upgrade-rocky10 parent: kayobe-overcloud-upgrade-base nodeset: kayobe-rocky10-16GB + voting: false - job: name: kayobe-overcloud-upgrade-ubuntu-noble @@ -343,6 +344,7 @@ name: kayobe-seed-upgrade-rocky10 parent: kayobe-seed-upgrade-base nodeset: kayobe-rocky10 + voting: false - job: name: kayobe-seed-upgrade-ubuntu-noble From f23a238b03103690cdea22ba27a22ee2de24e94c Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 10 Apr 2026 12:37:41 +0100 Subject: [PATCH 08/11] Sync kolla-ansible inventory for 2026.1 Synchronise Kayobe inventory templates with the current state of kolla-ansible's 2026.1 release inventory. Change-Id: I3d855149b850ddbd97b2bb1b7d3b155f46d5e19f Signed-off-by: Will Szumski --- .../templates/overcloud-components.j2 | 14 ++++---------- .../kolla-ansible/templates/overcloud-services.j2 | 13 ++++++++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index 6734b619b..f8c90e2cb 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -36,19 +36,9 @@ monitoring [etcd:children] control -[influxdb:children] -monitoring - [prometheus:children] monitoring -[telegraf:children] -compute -control -monitoring -network -storage - [hacluster:children] control @@ -151,6 +141,10 @@ control [skyline:children] control +# TODO(vurmil): Remove after G/2026.1 release as Redis migration is no longer required +[redis:children] +control + [valkey:children] control diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index 086045cb1..c02c2333d 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -18,12 +18,16 @@ common [fluentd:children] common -[kolla-logs:children] -common - [kolla-toolbox:children] common +[kolla_logs:children] +control +network +compute +storage +monitoring + [opensearch:children] control @@ -410,6 +414,9 @@ monitoring [prometheus-libvirt-exporter:children] compute +[prometheus-valkey-exporter:children] +valkey + [masakari-api:children] control From 71dee319de0cc99e7657a7c56684d541bc779ee3 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 10 Apr 2026 10:10:15 +0100 Subject: [PATCH 09/11] CI: Use main Rocky mirror We are frequently hitting issues downloading the mirrorlist in CI. This copies the change from kolla-ansible[1] with the hope that it will improve reliability. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/983965 Change-Id: Ic107bc1e21806cc6549ac86d8ccc83377fe2cfba Signed-off-by: Will Szumski --- roles/kayobe-ci-prep/tasks/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/roles/kayobe-ci-prep/tasks/main.yml b/roles/kayobe-ci-prep/tasks/main.yml index 1fe4da1d3..c44508217 100644 --- a/roles/kayobe-ci-prep/tasks/main.yml +++ b/roles/kayobe-ci-prep/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: Set Rocky Linux mirror to download.rockylinux.org + become: true + ansible.builtin.shell: + cmd: sed -i 's/mirrorlist/#mirrorlist/g; s/#baseurl/baseurl/g' /etc/yum.repos.d/rocky.repo + when: ansible_facts.distribution == "Rocky" + - block: - name: Install dbus for debian system apt: @@ -25,7 +31,7 @@ name: dnf-plugins-core state: present - - name: Enable the EPEL repository + - name: Disable the EPEL repository command: dnf config-manager --disable epel - name: Install packages needed for unprivileged mode From 1925cb197c342a0ef18a27004f04557ba4c857f7 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 10 Apr 2026 15:28:35 +0100 Subject: [PATCH 10/11] Revert "Make rocky slurp upgrade jobs non-voting" This reverts commit d39e3fa14dfb7c01fb4dc7cff672c5e004168aba. Change-Id: Ifde239cc12c03f3caca0c99b58d2842cf58ee625 Signed-off-by: Will Szumski --- zuul.d/jobs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 8d081aafe..31cb807d3 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -201,7 +201,6 @@ name: kayobe-overcloud-upgrade-slurp-rocky10 parent: kayobe-overcloud-upgrade-base nodeset: kayobe-rocky10-16GB - voting: false - job: name: kayobe-overcloud-upgrade-slurp-ubuntu-noble @@ -355,7 +354,6 @@ name: kayobe-seed-upgrade-slurp-rocky10 parent: kayobe-seed-upgrade-base nodeset: kayobe-rocky10 - voting: false - job: name: kayobe-seed-upgrade-slurp-ubuntu-noble From 6c5e1ace97620adbffa6e88776a5e41a0e4a0b83 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 10 Apr 2026 20:04:54 +0200 Subject: [PATCH 11/11] Revert "CI: Make all rocky upgrade jobs non-voting" This reverts commit a125d03c91e4cb8bda2651ec9422cadd28f0554c. Change-Id: Ib0d3b9c22eaf639ba80ccfb465a3286167d1ecca Signed-off-by: Pierre Riteau --- zuul.d/jobs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 31cb807d3..042114e69 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -190,7 +190,6 @@ name: kayobe-overcloud-upgrade-rocky10 parent: kayobe-overcloud-upgrade-base nodeset: kayobe-rocky10-16GB - voting: false - job: name: kayobe-overcloud-upgrade-ubuntu-noble @@ -343,7 +342,6 @@ name: kayobe-seed-upgrade-rocky10 parent: kayobe-seed-upgrade-base nodeset: kayobe-rocky10 - voting: false - job: name: kayobe-seed-upgrade-ubuntu-noble