Merge "Fix rescue of volume-based instances"

This commit is contained in:
Zuul 2022-10-25 21:21:34 +00:00 committed by Gerrit Code Review
commit a4718409f5
2 changed files with 7 additions and 3 deletions

View File

@ -37,6 +37,7 @@ MICROVERSION_FEATURES = {
"auto_allocated_network": ["2.37", "2.60"],
"key_types": ["2.2", "2.9"],
"key_type_list": ["2.9"],
"rescue_instance_volume_based": ["2.87", "2.93"],
},
"cinder": {
"groups": ["3.27", "3.43", "3.48", "3.58"],

View File

@ -665,9 +665,12 @@ def server_metadata_delete(request, instance_id, keys):
@profiler.trace
def server_rescue(request, instance_id, password=None, image=None):
_nova.novaclient(request).servers.rescue(instance_id,
password=password,
image=image)
microversion = get_microversion(request, "rescue_instance_volume_based")
_nova.novaclient(request, version=microversion).servers.rescue(
instance_id,
password=password,
image=image
)
@profiler.trace