Synchronise master with upstream

ansible/baremetal-compute-rename.yml

@@ -54,16 +54,16 @@
 
     - name: Rename baremetal compute nodes
       command: >
-        {{ venv }}/bin/openstack baremetal node set --name "{{ inventory_hostname }}" "{{ node['UUID'] }}"
+        {{ venv }}/bin/openstack baremetal node set --name "{{ inventory_hostname }}" "{{ node['uuid'] }}"
       delegate_to: "{{ controller_host }}"
       environment: "{{ openstack_auth_env }}"
       vars:
         # NOTE: Without this, the controller's ansible_host variable will not
         # be respected when using delegate_to.
         ansible_host: "{{ hostvars[controller_host].ansible_host | default(controller_host) }}"
         ipmi_address: "{{ hostvars[inventory_hostname].ipmi_address }}"
-        matching_nodes: "{{ (nodes.stdout | from_json) | selectattr('Driver Info.ipmi_address', 'defined') | selectattr('Driver Info.ipmi_address', 'equalto', ipmi_address) | list }}"
+        matching_nodes: "{{ (nodes.stdout | from_json) | selectattr('driver_info.ipmi_address', 'defined') | selectattr('driver_info.ipmi_address', 'equalto', ipmi_address) | list }}"
         node: "{{ matching_nodes | first }}"
       when:
         - matching_nodes | length > 0
-        - node['Name'] != inventory_hostname
+        - node['name'] != inventory_hostname

ansible/baremetal-compute-serial-console.yml

@@ -79,11 +79,11 @@
           fail:
             msg: >-
               In order to use the serial console you must set the console_interface to ipmitool-socat.
-          when: node["Console Interface"] != "ipmitool-socat"
+          when: node["console_interface"] != "ipmitool-socat"
 
         - name: Set IPMI serial console terminal port
           vars:
-            name: "{{ node['Name'] }}"
+            name: "{{ node['name'] }}"
             port: "{{ hostvars[controller_host].console_allocation_result.ports[name] }}"
             # NOTE: Without this, the controller's ansible_host variable will not
             # be respected when using delegate_to.
@@ -93,23 +93,23 @@
           delegate_to: "{{ controller_host }}"
           environment: "{{ openstack_auth_env }}"
           when: >-
-            node['Driver Info'].ipmi_terminal_port is not defined or
-            node['Driver Info'].ipmi_terminal_port | int != port | int
+            node['driver_info'].ipmi_terminal_port is not defined or
+            node['driver_info'].ipmi_terminal_port | int != port | int
 
         - name: Enable the IPMI socat serial console
           vars:
             # NOTE: Without this, the controller's ansible_host variable will not
             # be respected when using delegate_to.
             ansible_host: "{{ hostvars[controller_host].ansible_host | default(controller_host) }}"
           command: >
-            {{ venv }}/bin/openstack baremetal node console enable {{ node['Name'] }}
+            {{ venv }}/bin/openstack baremetal node console enable {{ node['name'] }}
           delegate_to: "{{ controller_host }}"
           environment: "{{ openstack_auth_env }}"
-          when: not node['Console Enabled']
+          when: not node['console_enabled']
       vars:
         matching_nodes: >-
-          {{ (nodes.stdout | from_json) | selectattr('Name', 'defined') |
-          selectattr('Name', 'equalto', inventory_hostname) | list }}
+          {{ (nodes.stdout | from_json) | selectattr('name', 'defined') |
+          selectattr('name', 'equalto', inventory_hostname) | list }}
         node: "{{ matching_nodes | first }}"
       when:
         - cmd == "enable"
@@ -122,14 +122,14 @@
             # be respected when using delegate_to.
             ansible_host: "{{ hostvars[controller_host].ansible_host | default(controller_host) }}"
           command: >
-            {{ venv }}/bin/openstack baremetal node console disable {{ node['Name'] }}
+            {{ venv }}/bin/openstack baremetal node console disable {{ node['name'] }}
           delegate_to: "{{ controller_host }}"
           environment: "{{ openstack_auth_env }}"
-          when: node['Console Enabled']
+          when: node['console_enabled']
       vars:
         matching_nodes: >-
-          {{ (nodes.stdout | from_json) | selectattr('Name', 'defined') |
-          selectattr('Name', 'equalto', inventory_hostname) | list }}
+          {{ (nodes.stdout | from_json) | selectattr('name', 'defined') |
+          selectattr('name', 'equalto', inventory_hostname) | list }}
         node: "{{ matching_nodes | first }}"
       when:
         - cmd == "disable"

ansible/roles/ipa-images/tasks/set-driver-info.yml

@@ -36,11 +36,11 @@
 
 - name: Make sure openstack nodes are in baremetal-compute group
   add_host:
-    name: "{{ item.Name }}"
+    name: "{{ item.name }}"
     groups: baremetal-compute
   when:
-    - item.Name is not none
-    - item.Name not in groups["baremetal-compute"]
+    - item.name is not none
+    - item.name not in groups["baremetal-compute"]
   with_items: "{{ ipa_images_ironic_node_list.stdout | from_json }}"
 
 - name: Set fact containing filtered list of nodes
@@ -55,15 +55,15 @@
   set_fact:
     ipa_images_ironic_nodes: "{{ ipa_images_ironic_nodes + [item] }}"
   with_items: "{{ ipa_images_ironic_node_list.stdout | from_json }}"
-  when: item['Name'] in ipa_images_compute_node_whitelist
+  when: item['name'] in ipa_images_compute_node_whitelist
 
 - name: Ensure ironic nodes use the new Ironic Python Agent (IPA) images
   command: >
-    {{ ipa_images_venv }}/bin/openstack baremetal node set {{ item.UUID }}
+    {{ ipa_images_venv }}/bin/openstack baremetal node set {{ item.uuid }}
     --driver-info deploy_kernel={{ ipa_images_kernel_uuid }}
     --driver-info deploy_ramdisk={{ ipa_images_ramdisk_uuid }}
   with_items: "{{ ipa_images_ironic_nodes }}"
   when:
-    item["Driver Info"].deploy_kernel != ipa_images_kernel_uuid or
-    item["Driver Info"].deploy_ramdisk != ipa_images_ramdisk_uuid
+    item["driver_info"].deploy_kernel != ipa_images_kernel_uuid or
+    item["driver_info"].deploy_ramdisk != ipa_images_ramdisk_uuid
   environment: "{{ ipa_images_ironic_openstack_auth_env }}"

zuul.d/project.yaml

@@ -28,14 +28,14 @@
         - kayobe-overcloud-upgrade-slurp-rocky10
         - kayobe-overcloud-upgrade-slurp-ubuntu-noble
         - kayobe-overcloud-upgrade-ubuntu-noble
-        #- kayobe-seed-rocky10
-        #- kayobe-seed-rocky10-podman
-        #- kayobe-seed-ubuntu-noble
-        #- kayobe-seed-ubuntu-noble-podman
-        #- kayobe-seed-upgrade-rocky10
-        #- kayobe-seed-upgrade-slurp-rocky10
-        #- kayobe-seed-upgrade-slurp-ubuntu-noble
-        #- kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-rocky10
+        - kayobe-seed-rocky10-podman
+        - kayobe-seed-ubuntu-noble
+        - kayobe-seed-ubuntu-noble-podman
+        - kayobe-seed-upgrade-rocky10
+        - kayobe-seed-upgrade-slurp-rocky10
+        - kayobe-seed-upgrade-slurp-ubuntu-noble
+        - kayobe-seed-upgrade-ubuntu-noble
         - kayobe-seed-vm-rocky10
         - kayobe-seed-vm-ubuntu-noble
     gate:
@@ -59,14 +59,14 @@
         - kayobe-overcloud-upgrade-slurp-rocky10
         - kayobe-overcloud-upgrade-slurp-ubuntu-noble
         - kayobe-overcloud-upgrade-ubuntu-noble
-        #- kayobe-seed-rocky10
-        #- kayobe-seed-rocky10-podman
-        #- kayobe-seed-ubuntu-noble
-        #- kayobe-seed-ubuntu-noble-podman
-        #- kayobe-seed-upgrade-rocky10
-        #- kayobe-seed-upgrade-slurp-rocky10
-        #- kayobe-seed-upgrade-slurp-ubuntu-noble
-        #- kayobe-seed-upgrade-ubuntu-noble
+        - kayobe-seed-rocky10
+        - kayobe-seed-rocky10-podman
+        - kayobe-seed-ubuntu-noble
+        - kayobe-seed-ubuntu-noble-podman
+        - kayobe-seed-upgrade-rocky10
+        - kayobe-seed-upgrade-slurp-rocky10
+        - kayobe-seed-upgrade-slurp-ubuntu-noble
+        - kayobe-seed-upgrade-ubuntu-noble
         - kayobe-seed-vm-rocky10
         - kayobe-seed-vm-ubuntu-noble