Merge pull request #513 from stackhpc/upstream/master-2025-12-22

Synchronise master with upstream

Author: Alex-Welsh

ansible/inventory/group_vars/all/bifrost

@@ -96,6 +96,10 @@ kolla_bifrost_inspector_hooks: "{{ inspector_hooks }}"
 # 'active' or 'pxe'.
 kolla_bifrost_inspector_port_addition: "{{ inspector_add_ports }}"
 
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+# Default follows Bifrost's default of 'present'.
+kolla_bifrost_inspector_keep_ports: "present"
+
 # List of extra kernel parameters for the inspector default PXE configuration.
 # Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
 # When customising this variable, the default extra kernel parameters should be

ansible/kolla-ansible.yml

@@ -99,6 +99,7 @@
         kolla_inspector_dhcp_pool_end: "{{ inspection_net_name | net_inspection_allocation_pool_end }}"
         kolla_inspector_netmask: "{{ inspection_net_name | net_mask }}"
         kolla_inspector_default_gateway: "{{ inspection_net_name | net_inspection_gateway or inspection_net_name | net_gateway }}"
+        kolla_inspector_dns_servers: "{{ inspection_net_name | net_inspection_dns_servers }}"
         kolla_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"
         kolla_libvirt_tls: "{{ compute_libvirt_enable_tls | bool }}"
         kolla_globals_paths_static:

ansible/roles/kolla-ansible/defaults/main.yml

@@ -200,6 +200,9 @@ kolla_inspector_netmask:
 # Default gateway to use for inspection network.
 kolla_inspector_default_gateway:
 
+# DNS servers for inspection network.
+kolla_inspector_dns_servers: []
+
 # List of extra kernel parameters for the inspector default PXE configuration.
 kolla_inspector_extra_kernel_options: []
 

ansible/roles/kolla-ansible/templates/kolla/globals.yml

@@ -401,6 +401,9 @@ ironic_dnsmasq_dhcp_ranges:
 {% if kolla_inspector_default_gateway %}
     routers: "{{ kolla_inspector_default_gateway }}"
 {% endif %}
+{% if kolla_inspector_dns_servers %}
+    dns_servers: "{{ kolla_inspector_dns_servers | join(',') }}"
+{% endif %}
 {% endif %}
 {% if kolla_inspector_extra_kernel_options %}
 ironic_kernel_cmdline_extras:

ansible/roles/kolla-bifrost/defaults/main.yml

@@ -48,6 +48,9 @@ kolla_bifrost_inspector_hooks:
 # 'active' or 'pxe'.
 kolla_bifrost_inspector_port_addition:
 
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+kolla_bifrost_inspector_keep_ports:
+
 # List of extra kernel parameters for the inspector default PXE configuration.
 kolla_bifrost_inspector_extra_kernel_options:
 

ansible/roles/kolla-bifrost/templates/kolla/config/bifrost/bifrost.yml

@@ -39,6 +39,11 @@ inspector_hooks: "{{ kolla_bifrost_inspector_hooks | join(',') }}"
 inspector_port_addition: "{{ kolla_bifrost_inspector_port_addition }}"
 {% endif %}
 
+{% if kolla_bifrost_inspector_keep_ports %}
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+inspector_keep_ports: "{{ kolla_bifrost_inspector_keep_ports }}"
+{% endif %}
+
 {% if kolla_bifrost_inspector_extra_kernel_options %}
 # Extra kernel parameters for the inspector default PXE configuration.
 inspector_extra_kernel_options: "{{ kolla_bifrost_inspector_extra_kernel_options if kolla_bifrost_inspector_extra_kernel_options is string else kolla_bifrost_inspector_extra_kernel_options | join(' ') }}"

ansible/roles/kolla-openstack/molecule/default/molecule.yml

@@ -8,8 +8,8 @@ driver:
 lint: |
   yamllint .
 platforms:
-  - name: centos-stream9
-    image: quay.io/centos/centos:stream9
+  - name: ubuntu-noble
+    image: quay.io/opendevmirror/ubuntu:24.04
     network_mode: host
 provisioner:
   name: ansible

ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml

@@ -8,8 +8,8 @@ driver:
 lint: |
   yamllint .
 platforms:
-  - name: centos-stream9
-    image: quay.io/centos/centos:stream9
+  - name: ubuntu-noble
+    image: quay.io/opendevmirror/ubuntu:24.04
     network_mode: host
 provisioner:
   name: ansible

doc/source/configuration/reference/bifrost.rst

@@ -276,6 +276,9 @@ The following options configure the Ironic Inspector service in the
     Which MAC addresses to add as ports during introspection. One of ``all``,
     ``active`` or ``pxe``. Default is ``{{ inspector_add_ports }}``, defined in
     ``${KAYOBE_CONFIG_PATH}/inspector.yml``.
+``kolla_bifrost_inspector_keep_ports``
+    Which ports to keep after introspection. One of ``all``, ``present`` or
+    ``added``. Default is ``present`` to align with Bifrost's defaults.
 ``kolla_bifrost_inspector_extra_kernel_options``
     List of extra kernel parameters for the inspector default PXE
     configuration. Default is ``{{ inspector_extra_kernel_options }}``, defined

doc/source/configuration/reference/network.rst

@@ -39,6 +39,8 @@ supported:
     IP address of the gateway for the hardware introspection network.
 ``neutron_gateway``
     IP address of the gateway for a neutron subnet based on this network.
+``inspection_dns_servers``
+    List of DNS servers used during hardware introspection.
 ``vlan``
     VLAN ID.
 ``mtu``
@@ -827,19 +829,22 @@ If using the overcloud to inspect bare metal workload (compute) hosts, it is
 necessary to define a DHCP allocation pool for the overcloud's ironic inspector
 DHCP server using the ``inspection_allocation_pool_start`` and
 ``inspection_allocation_pool_end`` attributes of the workload provisioning
-network.
+network. If ``kolla_internal_fqdn`` is set, it is mandatory to also supply one
+or more DNS servers using ``inspection_dns_servers``.
 
 .. note::
 
    This example assumes that the ``example`` network is mapped to
    ``provision_wl_net_name``.
 
-To configure a network called ``example`` with an inspection allocation pool:
+To configure a network called ``example`` with an inspection allocation pool
+and inspection DNS servers:
 
 .. code-block:: yaml
 
    example_inspection_allocation_pool_start: 10.0.1.196
    example_inspection_allocation_pool_end: 10.0.1.254
+   example_inspection_dns_servers: [10.0.1.10, 10.0.1.11]
 
 .. note::