Fix parameter order in add_instance_info_to_node

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

Change-Id: I1e7458a70a65f65f4da66d98d8fde6c031e3315e

nova/tests/unit/virt/ironic/test_driver.py

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

nova/virt/ironic/driver.py

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

releasenotes/notes/bug-2092570-fix-parameter-order-in-add_instance_info_to_node.yaml

@@ -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>.