Merge "Use boot.ipxe generated by Ironic"

playbooks/roles/bifrost-ironic-install/files/boot.ipxe

@@ -1,17 +0,0 @@
-#!ipxe
-
-isset ${mac:hexhyp} && goto boot_system ||
-chain ipxe.pxe
-
-# load the MAC-specific file or fail if it's not found
-:boot_system
-chain {{ ipxe_for_mac_uri }}${mac:hexhyp} || goto inspector_ipa
-
-:inspector_ipa
-chain {{ ipxe_for_mac_uri }}default || goto error_no_config
-
-:error_no_config
-echo PXE boot failed. No configuration found for MAC ${mac}
-echo Press any key to reboot...
-prompt --timeout 180 || reboot
-reboot

playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml

@@ -27,8 +27,11 @@
   service: name="{{ tftp_service_name }}" state=stopped enabled=no
   ignore_errors: yes
 
-- name: "Place boot.ipxe helper script /etc/ironic"
-  copy: src=boot.ipxe dest=/etc/ironic/boot.ipxe owner=ironic group=ironic mode=0744
+# NOTE(dtantsur): the code to remove boot.ipxe can be removed after Yoga
+- name: Remove the stale boot.ipxe
+  file:
+    path: /etc/ironic/boot.ipxe
+    state: absent
 
 # NOTE(dtantsur): the code to migrate from xinetd can be removed after Xena
 

playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2

@@ -67,7 +67,7 @@ deploy_logs_local_path = {{ ironic_agent_deploy_logs_local_path }}
 kernel_append_params = {{ pxe_kernel_params }}
 tftp_server = {{ internal_ip }}
 tftp_root = /tftpboot
-ipxe_boot_script = /etc/ironic/boot.ipxe
+ipxe_fallback_script = pxelinux.cfg/default
 tftp_master_path = {{ ironic_tftp_master_path }}
 {% if enable_uefi_ipxe | bool %}
 uefi_ipxe_bootfile_name = {{ ipxe_efi_binary }}

releasenotes/notes/ipxe-fallback-245535c4fb9ddc0b.yaml

@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    No longer installs ``/etc/ironic/boot.ipxe``, relying on the boot script
+    generated by Ironic instead.