Merge "Fix rebuild compute RPC API exception for rolling-upgrades" into stable/zed

Author: Zuul

nova/compute/manager.py

@@ -3637,7 +3637,7 @@ def rebuild_instance(self, context, instance, orig_image_ref, image_ref,
                          bdms, recreate, on_shared_storage,
                          preserve_ephemeral, migration,
                          scheduled_node, limits, request_spec, accel_uuids,
-                         reimage_boot_volume):
+                         reimage_boot_volume=None):
         """Destroy and re-make this instance.
 
         A 'rebuild' effectively purges all existing data from the system and
@@ -3671,7 +3671,7 @@ def rebuild_instance(self, context, instance, orig_image_ref, image_ref,
         :param accel_uuids: a list of cyborg ARQ uuids
         :param reimage_boot_volume: Boolean to specify whether the user has
                                     explicitly requested to rebuild a boot
-                                    volume
+                                    volume or None if RPC version is <=6.0
 
         """
         # recreate=True means the instance is being evacuated from a failed

nova/tests/functional/regressions/test_bug_2040264.py

@@ -11,7 +11,6 @@
 # under the License.
 
 from nova.tests import fixtures as nova_fixtures
-from nova.tests.functional.api import client
 from nova.tests.functional import integrated_helpers
 
 
@@ -46,13 +45,7 @@ def _test_rebuild_instance_with_compute_rpc_pin(self, version_cap):
 
     # We automatically pin to 6.0 if old computes are Yoga or older.
     def test_rebuild_instance_6_0(self):
-        e = self.assertRaises(client.OpenStackApiException,
-            self._test_rebuild_instance_with_compute_rpc_pin, '6.0')
-        self.assertEqual(500, e.response.status_code)
-        # NOTE(sbauza): This returns a TypeError because of
-        # 'reimage_boot_volume' and 'target_state' parameters missing from the
-        # rcpapi caller.
-        self.assertIn('TypeError', e.response.text)
+        self._test_rebuild_instance_with_compute_rpc_pin('6.0')
 
     # We automatically pin to 6.1 if old computes are Zed.
     def test_rebuild_instance_6_1(self):