diff options
| author | Adam Gandelman <adamg@ubuntu.com> | 2014-12-11 11:31:19 -0800 |
|---|---|---|
| committer | Adam Gandelman <adamg@ubuntu.com> | 2015-01-27 12:53:32 -0800 |
| commit | cb82dabdca5c37d9ac54e4c207a896a32f18525b (patch) | |
| tree | ddf36a5183cb04a3a51e96e95f9727214429ab89 /ironic/drivers/modules/ipxe_config.template | |
| parent | 5a7662419a2ba0f6fd29e7c4a4c77eec0fe8e116 (diff) | |
| download | ironic-cb82dabdca5c37d9ac54e4c207a896a32f18525b.tar.gz | |
Do not pass PXE net config from bootloader to ramdisk
All PXE templates currently pass network configuration from the
bootloader to the ramdisk via a kernel parameter,
ip=$ip:$tftp-server:$gateway:$netmask. The current deploy-ironic
ramdisks built by DIB uses this to bring up networking manually,
but this behavior exists there for non-PXE deployments where DHCP
is unavailable. We ideally want ramdisks to use DHCP to allow pushing
more than just ip/gw/nm. This updates PXE templates to not pass net config,
since DHCP is assumed to be functioning for all PXE env. Without the
ip= parameter, the ramdisk has no easy way to resolve the boot server's
address. To signal where to callback to, a boot_server parameter has
been added that points back to the TFTP server address.
Closes-bug: 1401298
Change-Id: Icc04de7b8b7324ce685f930d2e8074b0c764fc0c
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 e25d7f01f..6b2d5813e 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 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 %} +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 %} initrd {{ pxe_options.deployment_ari_path }} boot |