diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 5e85cd88a..5b7bdf4ea 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -921,10 +921,10 @@ class CloudController(object): try: internal_id = ec2utils.ec2_id_to_id(ec2_id) instance = self.compute_api.get(context, internal_id) - i['shutdownState'] = _state_description(instance['vm_state'], + i['currentState'] = _state_description(instance['vm_state'], instance['shutdown_terminate']) except exception.NotFound: - i['shutdownState'] = _state_description(vm_states.DELETED, + i['currentState'] = _state_description(vm_states.DELETED, True) instances_set.append(i) return {'instancesSet': instances_set} |