openstack
/
ironic
Code Issues Proposed changes

Merge "Read disk identifier after config drive setup" into stable/ocata

This commit is contained in:
Jenkins 2017-05-08 16:06:06 +00:00 committed by Gerrit Code Review
parent f661c51d58 451251def7
commit ed2f6cea89
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/drivers/modules/deploy_utils.py
View File

@ -401,12 +401,13 @@ def deploy_disk_image(address, port, iqn, lun,
with _iscsi_setup_and_handle_errors(address, port, iqn,
lun) as dev:
disk_utils.populate_image(image_path, dev)
disk_identifier = disk_utils.get_disk_identifier(dev)
if configdrive:
disk_utils.create_config_drive_partition(node_uuid, dev,
configdrive)
disk_identifier = disk_utils.get_disk_identifier(dev)
return {'disk identifier': disk_identifier}

5
releasenotes/notes/fix-disk-identifier-overwrite-42b33a5a0f7742d8.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Fix handling of whole disk images with 0x00000000 disk identifier.
Instances failed to boot as the identifier in boot config was overwritten
during config drive creation. See https://bugs.launchpad.net/ironic/+bug/1685093