-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathboot.ipxe.patch
37 lines (30 loc) · 2.97 KB
/
boot.ipxe.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
--- /usr/lib/python2.7/site-packages/ironic/drivers/modules/boot.ipxe.orig 2015-11-03 10:22:42.236000000 +0000
+++ /usr/lib/python2.7/site-packages/ironic/drivers/modules/boot.ipxe 2015-11-03 10:22:53.181000000 +0000
@@ -1,10 +1,10 @@
#!ipxe
# load the MAC-specific file or fail if it's not found
-chain pxelinux.cfg/${mac:hexhyp} || goto error_no_config
+chain pxelinux.cfg/${net0/mac:hexhyp} || goto error_no_config
:error_no_config
-echo PXE boot failed. No configuration found for MAC ${mac}
+echo PXE boot failed. No configuration found for MAC ${net0/mac}
echo Press any key to reboot...
prompt --timeout 180
reboot
--- /usr/share/instack-undercloud/ironic-discoverd/os-apply-config/httpboot/discoverd.ipxe.orig 2015-11-03 10:25:23.726000000 +0000
+++ /usr/share/instack-undercloud/ironic-discoverd/os-apply-config/httpboot/discoverd.ipxe 2015-11-03 10:25:33.301000000 +0000
@@ -2,6 +2,6 @@
dhcp
-kernel http://{{local-ip}}:8088/discovery.kernel discoverd_callback_url=http://{{local-ip}}:5050/v1/continue RUNBENCH={{discovery.runbench}} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac}
+kernel http://{{local-ip}}:8088/discovery.kernel discoverd_callback_url=http://{{local-ip}}:5050/v1/continue RUNBENCH={{discovery.runbench}} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${net0/mac}
initrd http://{{local-ip}}:8088/discovery.ramdisk
boot
--- /usr/lib/python2.7/site-packages/ironic/drivers/modules/ipxe_config.template.orig 2015-11-03 15:44:27.387000000 +0000
+++ /usr/lib/python2.7/site-packages/ironic/drivers/modules/ipxe_config.template 2015-11-03 15:44:34.815000000 +0000
@@ -5,7 +5,7 @@
goto deploy
:deploy
-kernel {{ pxe_options.deployment_aki_path }} selinux=0 disk={{ pxe_options.disk }} iscsi_target_iqn={{ pxe_options.iscsi_target_iqn }} deployment_id={{ pxe_options.deployment_id }} deployment_key={{ pxe_options.deployment_key }} ironic_api_url={{ pxe_options.ironic_api_url }} troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} boot_option={{ pxe_options.boot_option }} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} {% if pxe_options.root_device %}root_device={{ pxe_options.root_device }}{% endif %} ipa-api-url={{ pxe_options['ipa-api-url'] }} ipa-driver-name={{ pxe_options['ipa-driver-name'] }} coreos.configdrive=0
+kernel {{ pxe_options.deployment_aki_path }} selinux=0 disk={{ pxe_options.disk }} iscsi_target_iqn={{ pxe_options.iscsi_target_iqn }} deployment_id={{ pxe_options.deployment_id }} deployment_key={{ pxe_options.deployment_key }} ironic_api_url={{ pxe_options.ironic_api_url }} troubleshoot=0 text {{ pxe_options.pxe_append_params|default("", true) }} boot_option={{ pxe_options.boot_option }} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${net0/mac} {% if pxe_options.root_device %}root_device={{ pxe_options.root_device }}{% endif %} ipa-api-url={{ pxe_options['ipa-api-url'] }} ipa-driver-name={{ pxe_options['ipa-driver-name'] }} coreos.configdrive=0
initrd {{ pxe_options.deployment_ari_path }}
boot