diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-05 11:31:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-05 11:31:03 +0000 |
| commit | 1de4ed79e136e17e146c99fd4be6a40a397293e9 (patch) | |
| tree | 2f40009f913fc574bd8c728f289b390004ee489f | |
| parent | a6f4500504217bec529dd67e8471bc9300605e72 (diff) | |
| parent | 761e466e7a0628ae939dd654152f615732ad4f79 (diff) | |
| download | horizon-1de4ed79e136e17e146c99fd4be6a40a397293e9.tar.gz | |
Merge "Fix rescue of volume-based instances" into stable/zed
| -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 981b1148d..03bdee1a9 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 |