diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-29 19:55:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-29 19:55:40 +0000 |
| commit | 8e8637e58be26861914ccb7d034ce7a802d96059 (patch) | |
| tree | 6ab5d9b5bfc9fcacbbeab6ac2be84fc5e30a12d4 | |
| parent | 9d488bdcea6d08e7d7a9fc62d00637334674c08b (diff) | |
| parent | 0498793136b2f219decafdeeefd76891ef4fee25 (diff) | |
| download | horizon-8e8637e58be26861914ccb7d034ce7a802d96059.tar.gz | |
Merge "Fix rescue of volume-based instances" into stable/xena
| -rw-r--r-- | openstack_dashboard/api/microversions.py | 1 | ||||
| -rw-r--r-- | openstack_dashboard/api/nova.py | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/openstack_dashboard/api/microversions.py b/openstack_dashboard/api/microversions.py index 9d33952ec..d31712ce8 100644 --- a/openstack_dashboard/api/microversions.py +++ b/openstack_dashboard/api/microversions.py @@ -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"], diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py index 394d893e3..29d56dc3f 100644 --- a/openstack_dashboard/api/nova.py +++ b/openstack_dashboard/api/nova.py @@ -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 |