Alex-Welsh · Oct 12, 2026 · Sep 30, 2026 · Sep 30, 2026 · Oct 2, 2026 · Oct 2, 2026
@@ -140,6 +140,7 @@
       kolla_inspector_keep_ports: "{{ inspector_keep_ports }}"
       kolla_inspector_enable_discovery: "{{ inspector_enable_discovery }}"
       kolla_inspector_discovery_enroll_node_driver: "{{ inspector_discovery_enroll_node_driver }}"
+      kolla_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"
       kolla_inspector_ipa_host: "{{ groups['controllers_with_ironic_enabled_True'][0] }}"
       kolla_openstack_custom_config_paths_extra_multi_env_static:
         - "{{ kayobe_config_path }}"

@@ -159,7 +159,7 @@
         -e @/etc/bifrost/bifrost.yml
         -e @/etc/bifrost/dib.yml
         --limit {{ bifrost_limit | join(':') }}'
-      when: bifrost_limit
+      when: bifrost_limit | length > 0
       delegate_to: "{{ seed_host }}"
       vars:
         # NOTE: Without this, the seed's ansible_host variable will not be

@@ -563,6 +563,9 @@ kolla_inspector_enable_discovery:
 # The Ironic driver with which to register newly discovered nodes.
 kolla_inspector_discovery_enroll_node_driver:
 
+# List of extra kernel parameters for the inspection ramdisk when booted by Ironic.
+kolla_inspector_extra_kernel_options:
+
 # URL of Ironic Python Agent (IPA) kernel image for Ironic Inspector.
 # Mutually exclusive with kolla_inspector_ipa_kernel_path.
 kolla_inspector_ipa_kernel_upstream_url:

@@ -117,12 +117,15 @@
 - name: "Ensure extra configuration files exist (strategy: concat)"
   vars:
     params:
-      content: |
-        {%- for path in item.sources -%}
-        {{ lookup('file', path) }}
-        {%- endfor -%}
+      # join() guarantees exactly one newline between sources, regardless
+      # of whether a source file ends with one - lookup('file') rstrips
+      # trailing whitespace from each source, so concatenating without an
+      # explicit separator can glue the last line of one file to the first
+      # line of the next.
+      content: "{{ query('file', *item.sources) | join('\n') }}\n"
       dest: "{{ item.dest }}"
       mode: 0640
+      lstrip_blocks: true
   template_content: "{{ params | combine(item.params) }}"
   with_items: "{{ kolla_custom_config_info.concat }}"
 

@@ -69,6 +69,10 @@ keep_ports = {{ kolla_inspector_keep_ports }}
 hooks = {{ kolla_inspector_hooks | join(',') }}
 {% endif %}
 
+{% if kolla_inspector_extra_kernel_options %}
+extra_kernel_params = {{ kolla_inspector_extra_kernel_options if kolla_inspector_extra_kernel_options is string else kolla_inspector_extra_kernel_options | join(' ') }}
+{% endif %}
+
 {% if kolla_extra_ironic %}
 #######################
 # Extra configuration

@@ -4,7 +4,7 @@
 
 node_types:
   type0:
-    memory_mb: 3072
+    memory_mb: 4096
     vcpus: 1
     volumes:
       # There is a minimum disk space capacity requirement of 4GiB when using Ironic Python Agent:
@@ -14,9 +14,7 @@ node_types:
     physical_networks:
       - physnet1
     console_log_enabled: true
-    # We seem to hit issues with missing cpu features in CI as a result of using host-model, e.g:
-    # https://zuul.opendev.org/t/openstack/build/02c33ab51664419a88a5a54ad22852a9/log/primary/system_logs/libvirt/qemu/tk0.txt.gz#38
-    cpu_mode:
+    cpu_mode: maximum
 
 specs:
   - type: type0

@@ -278,6 +278,13 @@ Run the ``dev/seed-deploy.sh`` script to deploy the seed services::
     export KAYOBE_SEED_VM_PROVISION=0
     ./dev/seed-deploy.sh
 
+``KAYOBE_SEED_VM_PROVISION=0`` tells the deployment script to skip deploying the
+seed vm. This is because we set up our host's IP as ``192.168.33.5``, which is
+set in ``network-allocation.yml`` as the seed's IP - meaning Kayobe will use our
+host as the seed. If you would prefer to run the seed in a VM on your host,
+you can set your IP as ``192.168.33.4`` to match with ``seed-hypervisor`` in
+``network-allocation.yml``, and ``export KAYOBE_SEED_VM_PROVISION=1``.
+
 Upon successful completion of this script, the seed will be active.
 
 Testing
@@ -319,6 +326,12 @@ It is now possible to discover, inspect and provision the controller VM::
 The controller VM is now accessible via SSH as the bootstrap user
 (``cloud-user``, ``rocky`` or ``ubuntu``) at ``192.168.33.3``.
 
+At this point you may wish to continue setting up your development environment with::
+
+    kayobe overcloud host configure
+    kayobe overcloud container image pull
+    kayobe overcloud service deploy
+
 The machines and networking created by Tenks can be cleaned up via
 ``dev/tenks-teardown-overcloud.sh``::
 

@@ -167,7 +167,11 @@ def read_config(self, source, config):
             ]
 
             templar = self._templar.copy_with_new_env(searchpath=searchpath)
-            result = templar.template(template_data)
+
+            # lstrip_blocks avoids Jinja2 block tags (e.g. {% if %}) leaving
+            # behind leading whitespace that glues adjacent lines together.
+            result = templar.template(
+                template_data, overrides=dict(lstrip_blocks=True))
             fakefile = StringIO(result)
             config.parse(fakefile)
             fakefile.close()

@@ -107,7 +107,11 @@ def read_config(self, source):
             ]
 
             templar = self._templar.copy_with_new_env(searchpath=searchpath)
-            template_data = templar.template(template_data)
+
+            # lstrip_blocks avoids Jinja2 block tags (e.g. {% if %}) leaving
+            # behind leading whitespace that glues adjacent lines together.
+            template_data = templar.template(
+                template_data, overrides=dict(lstrip_blocks=True))
             result = yaml.safe_load(template_data)
         return result or {}
 

@@ -49,7 +49,7 @@
         chdir: "{{ kayobe_src_dir }}"
         executable: /bin/bash
       # TODO(priteau): Fix baremetal inspect issues with UEFI
-      when: test_inspection | default(false) and ironic_boot_mode == 'bios'
+      when: ironic_boot_mode == 'bios'
 
     - name: Perform testing of the baremetal machines
       shell:

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with agent-based bare metal inspection, where the collectors
+    were not being configured by Ironic. This was the case when using the
+    managed inspection mode in Ironic.
@@ -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

@@ -431,7 +431,6 @@
     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
 
@@ -490,6 +489,5 @@
     name: kayobe-infra-vm-ubuntu-noble-cloud-image
     parent: kayobe-infra-vm-base
     nodeset: kayobe-ubuntu-noble
-    voting: false
     vars:
       infra_vm_use_cirros: false