diff options
author | Zuul <zuul@review.openstack.org> | 2018-10-25 06:29:00 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-10-25 06:29:00 +0000 |
commit | dd02698ad41774513aee0b123158c003e4af76eb (patch) | |
tree | 3d71541c2e5677f58553f15d29e40a209ba45cf5 /ironic/drivers/modules/ipxe.py | |
parent | 7140ee207dd2d2932c2542d26cd77bd05de4b103 (diff) | |
parent | 90d58ede94daa439aa784240b8157bdf8039ee37 (diff) | |
download | ironic-dd02698ad41774513aee0b123158c003e4af76eb.tar.gz |
Merge "Fix DHCPv6 support"
Diffstat (limited to 'ironic/drivers/modules/ipxe.py')
-rw-r--r-- | ironic/drivers/modules/ipxe.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ironic/drivers/modules/ipxe.py b/ironic/drivers/modules/ipxe.py index e1f6069e8..4eb687eb8 100644 --- a/ironic/drivers/modules/ipxe.py +++ b/ironic/drivers/modules/ipxe.py @@ -142,7 +142,8 @@ class iPXEBoot(pxe_base.PXEBaseMixin, base.BootInterface): # or was deleted. pxe_utils.create_ipxe_boot_script() - dhcp_opts = pxe_utils.dhcp_options_for_instance(task) + dhcp_opts = pxe_utils.dhcp_options_for_instance( + task, ipxe_enabled=True) provider = dhcp_factory.DHCPFactory() provider.update_dhcp(task, dhcp_opts) @@ -219,7 +220,8 @@ class iPXEBoot(pxe_base.PXEBaseMixin, base.BootInterface): pxe_utils.cache_ramdisk_kernel(task, instance_image_info) # If it's going to PXE boot we need to update the DHCP server - dhcp_opts = pxe_utils.dhcp_options_for_instance(task) + dhcp_opts = pxe_utils.dhcp_options_for_instance(task, + ipxe_enabled=True) provider = dhcp_factory.DHCPFactory() provider.update_dhcp(task, dhcp_opts) |