openstack/nova
Code Issues Proposed changes

Fix parameter order in add_instance_info_to_node

Browse Source 
Corrected the parameter order in `add_instance_info_to_node`.
Closes-Bug: #2092570

Change-Id: I1e7458a70a65f65f4da66d98d8fde6c031e3315e
This commit is contained in:
Suiong Ng
2025-01-16 11:08:46 +08:00
parent aadf01d05e
commit a458033568
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/unit/virt/ironic/test_driver.py
View File

@@ -2240,8 +2240,9 @@ class IronicDriverTestCase(test.NoDBTestCase):
mock_add_instance_info.assert_called_once_with( mock_add_instance_info.assert_called_once_with(
node, instance, node, instance,
test.MatchType(objects.ImageMeta), test.MatchType(objects.ImageMeta),
flavor,
test.MatchType(driver.InstanceDriverMetadata), test.MatchType(driver.InstanceDriverMetadata),
flavor, preserve) preserve_ephemeral=preserve)
self.mock_conn.set_node_provision_state.assert_called_once_with( self.mock_conn.set_node_provision_state.assert_called_once_with(
node_uuid, ironic_states.REBUILD, config_drive=mock.ANY, node_uuid, ironic_states.REBUILD, config_drive=mock.ANY,
) )

5
nova/virt/ironic/driver.py
View File

@@ -1749,8 +1749,9 @@ class IronicDriver(virt_driver.ComputeDriver):
node = self._get_node(node_id) node = self._get_node(node_id)
metadata = self.get_instance_driver_metadata(instance, network_info) metadata = self.get_instance_driver_metadata(instance, network_info)
self._add_instance_info_to_node(node, instance, image_meta, metadata, self._add_instance_info_to_node(node, instance, image_meta,
instance.flavor, preserve_ephemeral) instance.flavor, metadata,
preserve_ephemeral=preserve_ephemeral)
# Config drive # Config drive
configdrive_value = None configdrive_value = None

7
releasenotes/notes/bug-2092570-fix-parameter-order-in-add_instance_info_to_node.yaml Normal file
View File

@@ -0,0 +1,7 @@
---
fixes:
- |
Fixed an issue where the instance rebuild option failed for Ironic instances.
The problem was caused by an incorrect parameter order in the ``add_instance_info_to_node``
function, which was introduced by commit `93b90d2b` <https://review.opendev.org/c/openstack/nova/+/923910>.
For more details, see `bug 2092570` <https://bugs.launchpad.net/nova/+bug/2092570>.