diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-30 20:27:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-30 20:27:01 +0000 |
| commit | c2c8e26b0fa2c96d98f250b4cf6dd9a31bf43168 (patch) | |
| tree | 6fc341f8b7c15399d88d1e9200162ce9d92b5eac | |
| parent | 2439844c1899b069e59eb25e10db76d88743e12b (diff) | |
| parent | 1cd150cdc568e81eb2ead8819d5559cf3e23a296 (diff) | |
| download | horizon-c2c8e26b0fa2c96d98f250b4cf6dd9a31bf43168.tar.gz | |
Merge "Fix rescue of volume-based instances" into stable/yoga
| -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 ca200d234..5c301758f 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 |