Merge "Fix boot.ipxe config behavior to ensure proper use"

playbooks/roles/bifrost-ironic-install/README.md

@@ -125,6 +125,15 @@ enable_cors_credential_support: Boolean value, default false.  This variable
                                 noauth mode, this realistically should not
                                 be modified.
 
+Notes
+-----
+
+This role, by default, deploys an alternative boot.ipxe file to the one
+that ironic utilizes by default and configures ironic as such.  This is
+because not every boot case can be covered.  If you encounter one where
+you find that you need to modify the file, please notify us by filing a
+bug in Launchpad, https://bugs.launchpad.net/bifrost/.
+
 Dependencies
 ------------
 

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

@@ -33,8 +33,8 @@
 - name: "Place pxelinux.0"
   copy: src={{ syslinux_tftp_dir }}/pxelinux.0 dest=/tftpboot
   when: test_pxelinux.stat.exists == false
-- name: "Place boot.ipxe helper script to HTTP root"
-  copy: src=boot.ipxe dest=/httpboot/boot.ipxe owner=ironic group=ironic
+- name: "Place boot.ipxe helper script /etc/ironic/"
+  copy: src=boot.ipxe dest=/etc/ironic/boot.ipxe owner=ironic group=ironic mode=0744
 - name: "Place tftp config file"
   copy: src=xinetd.tftp dest=/etc/xinetd.d/tftp
 - name: "Copy iPXE image into place"

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

@@ -148,7 +148,7 @@
     dest=/etc/ironic/ironic.conf
     insertafter="[pxe]"
     regexp='^(.*)ipxe_boot_script=(.*)$'
-    line="ipxe_boot_script=$pybasedir/drivers/modules/boot.ipxe"
+    line="ipxe_boot_script=/etc/ironic/boot.ipxe"
 - name: "Configure SSH libvirt URL if testing"
   lineinfile:
     dest=/etc/ironic/ironic.conf