openstack/ironic
Code Issues Proposed changes

Merge "Build instance PXE options for unrescue"

Browse Source
This commit is contained in:
Zuul 2018-02-20 01:11:30 +00:00 committed by Gerrit Code Review
commit 7ebcb667d9
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ironic/drivers/modules/pxe.py
View File

@ -250,13 +250,12 @@ def _build_pxe_config_options(task, pxe_info, service=False):
else: else:
pxe_options = _build_deploy_pxe_options(task, pxe_info, mode=mode) pxe_options = _build_deploy_pxe_options(task, pxe_info, mode=mode)
if mode == 'deploy': # NOTE(pas-ha) we still must always add user image kernel and ramdisk
# NOTE(pas-ha) we still must always add user image kernel and ramdisk # info as later during switching PXE config to service mode the
# info as later during switching PXE config to service mode the # template will not be regenerated anew, but instead edited as-is.
# template will not be regenerated anew, but instead edited as-is. # This can be changed later if/when switching PXE config will also use
# This can be changed later if/when switching PXE config will also use # proper templating instead of editing existing files on disk.
# proper templating instead of editing existing files on disk. pxe_options.update(_build_instance_pxe_options(task, pxe_info))
pxe_options.update(_build_instance_pxe_options(task, pxe_info))
pxe_options.update(_build_extra_pxe_options()) pxe_options.update(_build_extra_pxe_options())

13
ironic/tests/unit/drivers/modules/test_pxe.py
View File

@ -250,11 +250,11 @@ class PXEPrivateMethodsTestCase(db_base.DbTestCase):
'deployment_aki_path': pxe_kernel, 'deployment_aki_path': pxe_kernel,
'tftp_server': tftp_server, 'tftp_server': tftp_server,
'ipxe_timeout': 0, 'ipxe_timeout': 0,
'ari_path': ramdisk,
'aki_path': kernel,
} }
if mode == 'deploy': if mode == 'rescue':
expected_options.update({'ari_path': ramdisk, 'aki_path': kernel})
elif mode == 'rescue':
self.node.provision_state = states.RESCUING self.node.provision_state = states.RESCUING
self.node.save() self.node.save()
@ -413,10 +413,11 @@ class PXEPrivateMethodsTestCase(db_base.DbTestCase):
'deployment_aki_path': pxe_kernel, 'deployment_aki_path': pxe_kernel,
'tftp_server': tftp_server, 'tftp_server': tftp_server,
'ipxe_timeout': ipxe_timeout_in_ms, 'ipxe_timeout': ipxe_timeout_in_ms,
'ari_path': ramdisk,
'aki_path': kernel,
} }
if mode == 'deploy':
expected_options.update({'ari_path': ramdisk, 'aki_path': kernel}) if mode == 'rescue':
elif mode == 'rescue':
self.node.provision_state = states.RESCUING self.node.provision_state = states.RESCUING
self.node.save() self.node.save()

6
releasenotes/notes/bug-1749433-363b747d2db67df6.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes a bug preventing a node from booting into the user instance after unrescuing
if instance netboot is used. See `bug 1749433
<https://bugs.launchpad.net/ironic/+bug/1749433>`_ for details.