diff options
| author | Jim Rollenhagen <jim@jimrollenhagen.com> | 2015-02-02 06:17:03 -0800 |
|---|---|---|
| committer | Jim Rollenhagen <jim@jimrollenhagen.com> | 2015-02-02 06:17:45 -0800 |
| commit | 16b8b5628991ca83964ea78e099dd1929df86189 (patch) | |
| tree | 398e1f0950b3223c993b705bb1880b84a2a5ceee /ironic/drivers/modules/ipxe_config.template | |
| parent | bfd74942df650cc548755f143c4ba424ed86f9fc (diff) | |
| download | ironic-16b8b5628991ca83964ea78e099dd1929df86189.tar.gz | |
Revert "Do not pass PXE net config from bootloader to ramdisk"
This reverts commit cb82dabdca5c37d9ac54e4c207a896a32f18525b.
Change-Id: Ie623483d01db434241bfb00a84c5e6b7321e04d5
Closes-Bug: #1417026
Diffstat (limited to 'ironic/drivers/modules/ipxe_config.template')
| -rw-r--r-- | ironic/drivers/modules/ipxe_config.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/drivers/modules/ipxe_config.template b/ironic/drivers/modules/ipxe_config.template index 6b2d5813e..e25d7f01f 100644 --- a/ironic/drivers/modules/ipxe_config.template +++ b/ironic/drivers/modules/ipxe_config.template @@ -5,7 +5,7 @@ dhcp 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 boot_server={{ pxe_options.tftp_server }} text {{ pxe_options.pxe_append_params|default("", true) }} BOOTIF=${mac} {% if pxe_options.root_device %}root_device={{ pxe_options.root_device }}{% endif %} +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) }} ip=${ip}:${next-server}:${gateway}:${netmask} BOOTIF=${mac} {% if pxe_options.root_device %}root_device={{ pxe_options.root_device }}{% endif %} initrd {{ pxe_options.deployment_ari_path }} boot |