Merge pull request #469 from stackhpc/upstream/2025.1-2025-09-08

Synchronise 2025.1 with upstream

Author: priteau

ansible/inventory/group_vars/all/seed-vm

@@ -46,15 +46,15 @@ seed_vm_root_format: qcow2
 # https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
+# "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2"
 # otherwise.
 seed_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
   https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2
+  https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-x86_64-9-latest.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the seed VM data volume.

ansible/network-connectivity.yml

@@ -68,9 +68,12 @@
       command: >
         ping {{ remote_ip }} -c1 -M do {% if mtu %} -s {{ mtu | int - icmp_overhead_bytes }}{% endif %}
       with_items: "{{ network_interfaces }}"
+      loop_control:
+        label: "{{ remote_host }} on {{ item }}"
       when:
-        - item | net_ip
         - remote_hosts | length > 0
+        - remote_ip | length > 0
+        - item | net_ip
       changed_when: False
       vars:
         # Select other hosts targeted by this play which have this network
@@ -83,6 +86,10 @@
              rejectattr('inventory_hostname', 'equalto', inventory_hostname) |
              map(attribute='inventory_hostname') |
              list }}
-        remote_host: "{{ remote_hosts | random }}"
-        remote_ip: "{{ item | net_ip(remote_host) }}"
+        # NOTE(wszumski): Needed to fix random choice for the run otherwise the
+        # when check: remote_ip | length > 0, would pass, but remote_ip was ''
+        # in the command.  Assumption was that this was being evaluated once
+        # for the when clause and then again for the command. Bug?
+        remote_host: "{{ remote_hosts | random(seed=ansible_facts.date_time.iso8601) }}"
+        remote_ip: "{{ lookup('cached', 'vars', item ~ '_ips')[remote_host] | default('', true) }}"
         mtu: "{{ item | net_mtu }}"

ansible/roles/bootstrap/tasks/main.yml

@@ -61,8 +61,10 @@
     user: "{{ ansible_facts.user_id }}"
     key: "{{ lookup('file', bootstrap_ssh_private_key_path ~ '.pub') }}"
 
+# NOTE(priteau): Exclude comments from ssh-keyscan output because they break
+# known_hosts on centos/rocky 10.
 - name: Scan for SSH keys
-  command: ssh-keyscan {{ item }}
+  shell: ssh-keyscan {{ item }} | grep -v '^#'
   with_items:
     - localhost
     - 127.0.0.1

ansible/roles/ssh-known-host/tasks/main.yml

@@ -13,9 +13,11 @@
       vm provision' and 'kayobe overcloud inventory discover'.
   when: not ansible_host | default(inventory_hostname)
 
+# NOTE(priteau): Exclude comments from ssh-keyscan output because they break
+# known_hosts on centos/rocky 10.
 - name: Scan for SSH keys
   local_action:
-    module: command ssh-keyscan {{ item }}
+    module: shell ssh-keyscan {{ item }} | grep -v '^#'
   with_items:
     - "{{ ansible_host|default(inventory_hostname) }}"
   register: keyscan_result

playbooks/kayobe-seed-vm-base/overrides.yml.j2

@@ -34,9 +34,11 @@ seed_vm_vcpus: 1
 # Reduce the memory footprint of the seed VM.
 seed_vm_memory_mb: "{{ 1 * 1024 }}"
 
-# Use cirros rather than CentOS for the VM.
+{% if seed_vm_use_cirros | default(true) %}
+# Use cirros rather than distribution cloud image for the VM.
 seed_bootstrap_user: cirros
 seed_vm_root_image: /opt/cache/files/cirros-0.5.3-x86_64-disk.img
+{% endif %}
 
 {% if seed_vm_boot_firmware is defined %}
 seed_vm_boot_firmware: "{{ seed_vm_boot_firmware }}"

releasenotes/notes/bug-2121588-ad6d8b33e3fcaff9.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes CentOS Stream 9 seed and infra VMs not booting by switching to an
+    EFI-compatible image.
+    `LP#2121588 <https://bugs.launchpad.net/kayobe/+bug/2121588>`__

releasenotes/notes/fix-networking-connectivity-check-with-partial-no-ip-5efcc8ed6e76267e.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes network connectivity check when a subset of hosts have the ``no_ip``
+    property set via group or host variables.
+    `LP#2120918 <https://bugs.launchpad.net/kayobe/+bug/2120918>`__

zuul.d/jobs.yaml

@@ -395,30 +395,52 @@
       kayobe_control_host_become: false
 
 - job:
-    name: kayobe-seed-vm-efi-base
+    name: kayobe-seed-vm-centos9s-cloud-image
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-centos9s
+    voting: false
+    vars:
+      seed_vm_use_cirros: false
+
+- job:
+    name: kayobe-seed-vm-rocky9-cloud-image
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-rocky9
+    vars:
+      seed_vm_use_cirros: false
+
+- job:
+    name: kayobe-seed-vm-ubuntu-noble-cloud-image
+    parent: kayobe-seed-vm-base
+    nodeset: kayobe-ubuntu-noble
+    voting: false
+    vars:
+      seed_vm_use_cirros: false
+
+- job:
+    name: kayobe-seed-vm-q35-base
     parent: kayobe-seed-vm-base
     description: |
-      Base job for testing seed VM provisioning with EFI and q35
+      Base job for testing seed VM provisioning with q35
     vars:
-      seed_vm_boot_firmware: efi
       seed_vm_machine: q35
 
 - job:
-    name: kayobe-seed-vm-centos9s-efi
-    parent: kayobe-seed-vm-efi-base
+    name: kayobe-seed-vm-centos9s-q35
+    parent: kayobe-seed-vm-q35-base
     nodeset: kayobe-centos9s
     voting: false
 
 - job:
-    name: kayobe-seed-vm-rocky9-efi
-    parent: kayobe-seed-vm-efi-base
+    name: kayobe-seed-vm-rocky9-q35
+    parent: kayobe-seed-vm-q35-base
     nodeset: kayobe-rocky9
     vars:
       kayobe_control_host_become: false
 
 - job:
-    name: kayobe-seed-vm-ubuntu-noble-efi
-    parent: kayobe-seed-vm-efi-base
+    name: kayobe-seed-vm-ubuntu-noble-q35
+    parent: kayobe-seed-vm-q35-base
     nodeset: kayobe-ubuntu-noble
 
 - job:

zuul.d/project.yaml

@@ -78,3 +78,9 @@
         - kayobe-seed-images-rocky9-podman
         - kayobe-seed-images-ubuntu-noble
         - kayobe-seed-images-ubuntu-noble-podman
+        - kayobe-seed-vm-centos9s-cloud-image
+        - kayobe-seed-vm-centos9s-q35
+        - kayobe-seed-vm-rocky9-cloud-image
+        - kayobe-seed-vm-rocky9-q35
+        - kayobe-seed-vm-ubuntu-noble-cloud-image
+        - kayobe-seed-vm-ubuntu-noble-q35