Merge "Adding ironic_dnsmasq_boot_file parameter to globals.yml"

ansible/roles/ironic/defaults/main.yml

@@ -125,5 +125,6 @@ openstack_ironic_inspector_auth: "{{ openstack_auth }}"
 
 ironic_dnsmasq_interface: "{{ api_interface }}"
 ironic_dnsmasq_dhcp_range:
+ironic_dnsmasq_boot_file: "pxelinux.0"
 ironic_cleaning_network:
 ironic_console_serial_speed: "115200n8"

ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2

@@ -5,5 +5,5 @@ dhcp-option=option:tftp-server,{{ api_interface_address }}
 dhcp-option=option:server-ip-address,{{ api_interface_address }}
 bind-interfaces
 dhcp-sequential-ip
-dhcp-option=option:bootfile-name,pxelinux.0
+dhcp-option=option:bootfile-name,{{ ironic_dnsmasq_boot_file }}
 dhcp-option=210,/tftpboot/

doc/source/reference/ironic-guide.rst

@@ -30,6 +30,18 @@ network:
 
 .. end
 
+In the same file, specify the PXE bootloader file for Ironic Inspector. The
+file is relative to the ``/tftpboot`` directory. The default is ``pxelinux.0``,
+and should be correct for x86 systems. Other platforms may require a different
+value, for example aarch64 on Debian requires
+``debian-installer/arm64/bootnetaa64.efi``.
+
+.. code-block:: yaml
+
+   ironic_dnsmasq_boot_file: pxelinux.0
+
+.. end
+
 Ironic inspector also requires a deploy kernel and ramdisk to be placed in
 ``/etc/kolla/config/ironic/``. The following example uses coreos which is
 commonly used in Ironic deployments, though any compatible kernel/ramdisk may

etc/kolla/globals.yml

@@ -381,6 +381,8 @@ glance_enable_rolling_upgrade: "no"
 # following value must be set when enable ironic, the value format
 # is "192.168.0.10,192.168.0.100".
 ironic_dnsmasq_dhcp_range:
+# PXE bootloader file for Ironic Inspector, relative to /tftpboot.
+#ironic_dnsmasq_boot_file: "pxelinux.0"
 
 ######################################
 # Manila - Shared File Systems Options