diff options
| author | Hironori Shiina <shiina.hironori@jp.fujitsu.com> | 2018-04-18 16:36:32 +0900 |
|---|---|---|
| committer | Hironori Shiina <shiina.hironori@jp.fujitsu.com> | 2018-04-18 16:36:32 +0900 |
| commit | c6789ea61f65c08c8954cfc07c5dc5426fa434f3 (patch) | |
| tree | f10d1430982e4b71e250a6c43d369aa8aabe7de1 /ironic/drivers/modules/ilo/boot.py | |
| parent | 5c1d5a8a82e007ca42ad3fe3329e7ea4745b941e (diff) | |
| download | ironic-c6789ea61f65c08c8954cfc07c5dc5426fa434f3.tar.gz | |
Stop removing root uuid in vendor interfaces
Now that driver_internal_info.root_uuid_or_disk_id is removed by the
conductor when tearing down a node, it is no longer necessary to
remove it in each vendor interface.
Change-Id: I7a6a41cda4d009e077261b3fee707cd601142f86
Diffstat (limited to 'ironic/drivers/modules/ilo/boot.py')
| -rw-r--r-- | ironic/drivers/modules/ilo/boot.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py index 0765cecfc..e744301b3 100644 --- a/ironic/drivers/modules/ilo/boot.py +++ b/ironic/drivers/modules/ilo/boot.py @@ -566,11 +566,6 @@ class IloVirtualMediaBoot(base.BootInterface): else: _clean_up_boot_iso_for_instance(task.node) driver_internal_info.pop('boot_iso_created_in_web_server', None) - # Need to retain 'root_uuid_or_disk_id' during rescue. It would - # be required if boot iso needs to be created during unrescue - # operation. - if task.node.provision_state != states.RESCUING: - driver_internal_info.pop('root_uuid_or_disk_id', None) ilo_common.cleanup_vmedia_boot(task) task.node.driver_internal_info = driver_internal_info task.node.save() |