openstack
/
kolla-ansible
Code Issues Proposed changes

Adding ironic_dnsmasq_boot_file parameter to globals.yml 

By now, ironic-dnsmasq has default bootfile pxelinux.0,
which is correct only for x86.
Adding ironic_dnsmasq_boot_file parameter to globals.yml
to make it configuable.
For example: /etc/kolla/globals.yml
ironic_dnsmasq_boot_file: "debian-installer/arm64/bootnetaa64.efi"

Change-Id: I6eb57702d4dad549ef8c999c1c82e577f316d8d6
(cherry picked from commit 4eaf397023)
This commit is contained in:
Zhangfei Gao 2018-05-18 16:27:06 +08:00 committed by Erol Guzoglu
parent a0fc16e575
commit 04ecd5717a
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/ironic/defaults/main.yml
View File

@ -66,5 +66,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"

2
ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2
View File

@ -5,5 +5,5 @@ dhcp-option=option:tftp-server,{{ kolla_internal_vip_address }}
dhcp-option=option:server-ip-address,{{ kolla_internal_vip_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/

12
doc/source/reference/ironic-guide.rst
View File

@ -37,6 +37,18 @@ tenant network types:
neutron_tenant_network_types: "vxlan,vlan,flat"
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
Configuring Web Console
=======================
Configuration based off upstream web_console_documentation_.

2
etc/kolla/globals.yml
View File

@ -363,6 +363,8 @@ kolla_internal_vip_address: "10.10.10.254"
# 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